[PATCH] falconide: fix resources reservation

[PATCH] falconide: fix resources reservation

[Bartlomiej Zolnierkiewicz]

* 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.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/legacy/falconide.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: b/drivers/ide/legacy/falconide.c
===================================================================
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -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);

Re: [PATCH] falconide: fix resources reservation

[Geert Uytterhoeven]

On Wed, 20 Feb 2008, Bartlomiej Zolnierkiewicz wrote:
> * 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.
> 
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Michael Schmitz <schmitz@debian.org>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
>  drivers/ide/legacy/falconide.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> Index: b/drivers/ide/legacy/falconide.c
> ===================================================================
> --- a/drivers/ide/legacy/falconide.c
> +++ b/drivers/ide/legacy/falconide.c
> @@ -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");
                                 ^^
Woops, missing parameter?

pr_error()?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

Re: [PATCH] falconide: fix resources reservation

[Bartlomiej Zolnierkiewicz]

On Wednesday 20 February 2008, Geert Uytterhoeven wrote:
> On Wed, 20 Feb 2008, Bartlomiej Zolnierkiewicz wrote:
> > * 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.
> > 
> > Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> > Cc: Michael Schmitz <schmitz@debian.org>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > ---
> >  drivers/ide/legacy/falconide.c |    7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > Index: b/drivers/ide/legacy/falconide.c
> > ===================================================================
> > --- a/drivers/ide/legacy/falconide.c
> > +++ b/drivers/ide/legacy/falconide.c
> > @@ -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");
>                                  ^^
> Woops, missing parameter?

thanks, fixed

> pr_error()?

dunno...

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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)

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/legacy/falconide.c |    7 +++++++
 1 file changed, 7 insertions(+)

Index: b/drivers/ide/legacy/falconide.c
===================================================================
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -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);