falconide: fix resources reservation
PATCH 1/1 falconide: fix resources reservation
* Tell IDE layer to not manage resources by setting hwif->mmio flag and request resources in falconide_init().
* Use request_mem_region() for resources reservation.
* Use driver name for resources reservation.
--- drivers/ide/legacy/falconide.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/ide/legacy/falconide.c +7 -0
@@ -22,6 +22,7 @@#include <asm/atariints.h> #include <asm/atari_stdma.h> +#define DRV_NAME "falconide"/* * Base of the IDE interface
@@ -74,6 +75,11 @@ static int __init falconide_init(void)printk (KERN_INFO "ide: Falcon IDE controller\n" ); +if (!request_mem_region (ATA_HD_BASE ,0x40 ,DRV_NAME )) { +printk (KERN_ERR "%s: resources busy\n" ); +return -EBUSY ; + } +falconide_setup_ports (&hw); hwif =ide_find_port ();
@@ -83,6 +89,7 @@ static int __init falconide_init(void)ide_init_port_data (hwif, index);ide_init_port_hw (hwif, &hw); + hwif->mmio =1 ;ide_get_lock (NULL ,NULL );ide_device_add (idx,NULL );
Quoted 27 lines · Bartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting
hwif->mmioflag and request resources infalconide_init().* Use
request_mem_region()for resources reservation.* Use driver name for resources reservation.
Cc Geert Uytterhoeven <[email protected]>Cc Michael Schmitz <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>--- drivers/ide/legacy/falconide.c | 7 +++++++ 1 file changed, 7 insertions(+)Index:
b/drivers/ide/legacy/falconide.c
===================================================================drivers/ide/legacy/falconide.c +1
-0@@ -22,6 +22,7 @@#include <asm/atariints.h> #include <asm/atari_stdma.h> +#define DRV_NAME "falconide"/* * Base of the IDE interface
drivers/ide/legacy/falconide.c static int __init falconide_init(void) · line 79
Quoted 5 lines
drivers/ide/legacy/falconide.c +2
-0@@ -74,6 +75,11 @@ static int __init falconide_init(void)printk (KERN_INFO "ide: Falcon IDE controller\n" ); +if (!request_mem_region (ATA_HD_BASE ,0x40 ,DRV_NAME )) { +printk (KERN_ERR "%s: resources busy\n" );
^^
Woops, missing parameter?
pr_error()?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 29 lines · Geert Uytterhoeven
Quoted 28 lines · Bartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting
hwif->mmioflag and request resources infalconide_init().* Use
request_mem_region()for resources reservation.* Use driver name for resources reservation.
Cc Geert Uytterhoeven <[email protected]>Cc Michael Schmitz <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>--- drivers/ide/legacy/falconide.c | 7 +++++++ 1 file changed, 7 insertions(+)Index:
b/drivers/ide/legacy/falconide.c
===================================================================drivers/ide/legacy/falconide.c +1
-0@@ -22,6 +22,7 @@#include <asm/atariints.h> #include <asm/atari_stdma.h> +#define DRV_NAME "falconide"/* * Base of the IDE interface @@ -74,6 +75,11 @@ static int __init falconide_init(void)
Quoted 6 lines
drivers/ide/legacy/falconide.c static int __init falconide_init(void) · line 79
Quoted 4 lines
drivers/ide/legacy/falconide.c +2
-0printk (KERN_INFO "ide: Falcon IDE controller\n" ); +if (!request_mem_region (ATA_HD_BASE ,0x40 ,DRV_NAME )) { +printk (KERN_ERR "%s: resources busy\n" );^^Woops, missing parameter?
thanks, fixed
Quoted 1 line
pr_error()?
dunno...
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] falconide: fix resources reservation (take 2)
* Tell IDE layer to not manage resources by setting hwif->mmio flag and request resources in falconide_init().
* Use request_mem_region() for resources reservation.
* Use driver name for resources reservation.
v2:
* Fix missing printk() parameter. (Noticed by Geert Uytterhoeven)
--- drivers/ide/legacy/falconide.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/ide/legacy/falconide.c +7 -0
@@ -22,6 +22,7 @@#include <asm/atariints.h> #include <asm/atari_stdma.h> +#define DRV_NAME "falconide"/* * Base of the IDE interface
@@ -74,6 +75,11 @@ static int __init falconide_init(void)printk (KERN_INFO "ide: Falcon IDE controller\n" ); +if (!request_mem_region (ATA_HD_BASE ,0x40 ,DRV_NAME )) { +printk (KERN_ERR "%s: resources busy\n" ,DRV_NAME ); +return -EBUSY ; + } +falconide_setup_ports (&hw); hwif =ide_find_port ();
@@ -83,6 +89,7 @@ static int __init falconide_init(void)ide_init_port_data (hwif, index);ide_init_port_hw (hwif, &hw); + hwif->mmio =1 ;ide_get_lock (NULL ,NULL );ide_device_add (idx,NULL );