From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762176AbYCAUpn (ORCPT ); Sat, 1 Mar 2008 15:45:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760289AbYCAUnl (ORCPT ); Sat, 1 Mar 2008 15:43:41 -0500 Received: from ug-out-1314.google.com ([66.249.92.172]:28384 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759745AbYCAUni (ORCPT ); Sat, 1 Mar 2008 15:43:38 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-disposition:message-id:content-type:content-transfer-encoding; b=f/UPbgLGo9ZVbiuC01mPiuK4b/ZMenLFzZlAbUaqkmhcr7KQWtZZsqtjjfNwJEFOJ2+h/B8JIpx6ripqUEz2VCKiuICqI0UE/ugzLRQ5h1I0f+KpN+SoFkD0hXy+G0/X1Go0B/gwEyQy0q2uXoHlyTqHvfEC05NnC6u/TdftrQg= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Subject: [PATCH 3/9] ide_arm: manage I/O resources in driver Date: Sat, 1 Mar 2008 19:47:49 +0100 User-Agent: KMail/1.9.6 (enterprise 0.20071204.744707) Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200803011947.49203.bzolnier@gmail.com> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Tell IDE layer to not manage resources by setting hwif->mmio flag. * Use {request,release}_region() for resources management. * Use driver name for resources management. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/arm/ide_arm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) Index: b/drivers/ide/arm/ide_arm.c =================================================================== --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c @@ -14,6 +14,8 @@ #include #include +#define DRV_NAME "ide_arm" + #ifdef CONFIG_ARCH_CLPS7500 # include # @@ -28,15 +30,30 @@ static int __init ide_arm_init(void) { ide_hwif_t *hwif; hw_regs_t hw; + unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; + if (!request_region(base, 8, DRV_NAME)) { + printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", + DRV_NAME, base, base + 7); + return -EBUSY; + } + + if (!request_region(ctl, 1, DRV_NAME)) { + printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n", + DRV_NAME, ctl); + release_region(base, 8); + return -EBUSY; + } + memset(&hw, 0, sizeof(hw)); - ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206); + ide_std_init_ports(&hw, base, ctl); hw.irq = IDE_ARM_IRQ; hwif = ide_find_port(); if (hwif) { ide_init_port_hw(hwif, &hw); + hwif->mmio = 1; idx[0] = hwif->index; ide_device_add(idx, NULL);