[2.6 patch] drivers/ide/: cleanups

[2.6 patch] drivers/ide/: cleanups

[Adrian Bunk]

This patch contains the following clenups:
- setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
- ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)
- ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was already sent on:
- 9 Jul 2006
- 26 Jun 2006
- 27 Apr 2006
- 19 Apr 2006
- 11 Apr 2006

 drivers/ide/ide-dma.c   |    2 --
 drivers/ide/ide.c       |    2 --
 drivers/ide/setup-pci.c |    4 +++-
 include/linux/ide.h     |    1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

--- linux-2.6.17-rc1-mm2-full/include/linux/ide.h.old	2006-04-10 22:46:27.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/include/linux/ide.h	2006-04-10 22:46:36.000000000 +0200
@@ -1188,7 +1188,6 @@
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
-extern void ide_pci_unregister_driver(struct pci_driver *driver);
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
 
--- linux-2.6.17-rc1-mm2-full/drivers/ide/ide.c.old	2006-04-10 22:43:31.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide.c	2006-04-10 22:43:41.000000000 +0200
@@ -826,8 +826,6 @@
 	return ide_register_hw_with_fixup(hw, hwifp, NULL);
 }
 
-EXPORT_SYMBOL(ide_register_hw);
-
 /*
  *	Locks for IDE setting functionality
  */
--- linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c.old	2006-04-10 22:44:21.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c	2006-04-10 22:44:28.000000000 +0200
@@ -152,8 +152,6 @@
 	return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
 /**
  *	ide_dma_intr	-	IDE DMA interrupt handler
  *	@drive: the drive the interrupt is for
--- linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c.old	2006-04-10 22:46:46.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c	2006-04-10 22:47:03.000000000 +0200
@@ -807,7 +807,8 @@
  *	Unregister a currently installed IDE driver. Returns are the same
  *	as for pci_unregister_driver
  */
- 
+
+#if 0
 void ide_pci_unregister_driver(struct pci_driver *driver)
 {
 	if(!pre_init)
@@ -817,6 +818,7 @@
 }
 
 EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
+#endif  /*  0  */
 
 /**
  *	ide_scan_pcidev		-	find an IDE driver for a device

Re: [2.6 patch] drivers/ide/: cleanups

[Michael Tokarev]

Adrian Bunk wrote:
> This patch contains the following clenups:
> - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()

Hmm.  So, ide drivers will be unloadable forever, without
a chance to fix it someday? ;)

Thanks.

/mjt

Re: [2.6 patch] drivers/ide/: cleanups

[Arjan van de Ven]

On Tue, 2006-07-11 at 18:30 +0400, Michael Tokarev wrote:
> Adrian Bunk wrote:
> > This patch contains the following clenups:
> > - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> 
> Hmm.  So, ide drivers will be unloadable forever, without
> a chance to fix it someday? ;)

that's why it's #if 0... so that if someone goes in to fix it he only
has to remove the if 0 line...

Re: [2.6 patch] drivers/ide/: cleanups

[Sergei Shtylyov]

Hello.

Adrian Bunk wrote:

> This patch contains the following clenups:
> - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> - ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)

    It's used by arm/bast-ide.c (CONFIG_NLK_DEV_IDE_BAST is defined as 
tristate). I don't understand what's the point insisting on its removal since 
any SOC modular driver in the future may need it...

> - ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)

> Signed-off-by: Adrian Bunk <bunk@stusta.de>

WBR, Sergei

[2.6 patch] drivers/ide/: cleanups

[Adrian Bunk]

On Tue, Jul 11, 2006 at 06:38:32PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> Adrian Bunk wrote:
> 
> >This patch contains the following clenups:
> >- setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> >- ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)
> 
>    It's used by arm/bast-ide.c (CONFIG_NLK_DEV_IDE_BAST is defined as 
> tristate).

Sorry, my fault.

I did grep and check the options, but it seems I missed this one.

Updated patch below.

> I don't understand what's the point insisting on its removal 
> since any SOC modular driver in the future may need it...

There are two points:
- re-adding is trivial if it's ever needed, but until then it only
  bloats the kernel
- drivers/ide/ are the legacy IDE drivers that will be superseded
  by libata

>...
> WBR, Sergei

cu
Adrian


<--  snip  -->


This patch contains the following clenups:
- setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
- ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/ide/ide-dma.c   |    2 --
 drivers/ide/setup-pci.c |    4 +++-
 include/linux/ide.h     |    1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

--- linux-2.6.17-rc1-mm2-full/include/linux/ide.h.old	2006-04-10 22:46:27.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/include/linux/ide.h	2006-04-10 22:46:36.000000000 +0200
@@ -1188,7 +1188,6 @@
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
-extern void ide_pci_unregister_driver(struct pci_driver *driver);
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
 
--- linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c.old	2006-04-10 22:44:21.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c	2006-04-10 22:44:28.000000000 +0200
@@ -152,8 +152,6 @@
 	return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
 /**
  *	ide_dma_intr	-	IDE DMA interrupt handler
  *	@drive: the drive the interrupt is for
--- linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c.old	2006-04-10 22:46:46.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c	2006-04-10 22:47:03.000000000 +0200
@@ -807,7 +807,8 @@
  *	Unregister a currently installed IDE driver. Returns are the same
  *	as for pci_unregister_driver
  */
- 
+
+#if 0
 void ide_pci_unregister_driver(struct pci_driver *driver)
 {
 	if(!pre_init)
@@ -817,6 +818,7 @@
 }
 
 EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
+#endif  /*  0  */
 
 /**
  *	ide_scan_pcidev		-	find an IDE driver for a device

Re: [2.6 patch] drivers/ide/: cleanups

[Adrian Bunk]

On Tue, Jul 11, 2006 at 05:19:04PM +0100, Alan Cox wrote:
> Ar Maw, 2006-07-11 am 16:16 +0200, ysgrifennodd Adrian Bunk:
> > This patch contains the following cleanups:
> 
> > - ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)
> 
> NAK. A simple grep shows ide_register_hw has users, 5 in fact as of
> 2.6.17.

I know, and I checked them, and Sergei already pointed out that I missed 
the one that can be modular.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.6 patch] drivers/ide/: cleanups

[Alan Cox]

Ar Maw, 2006-07-11 am 16:16 +0200, ysgrifennodd Adrian Bunk:
> This patch contains the following cleanups:

> - ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)

NAK. A simple grep shows ide_register_hw has users, 5 in fact as of
2.6.17.

Re: [2.6 patch] drivers/ide/: cleanups

[Alan Cox]

Ar Maw, 2006-07-11 am 18:30 +0400, ysgrifennodd Michael Tokarev:
> Adrian Bunk wrote:
> > This patch contains the following clenups:
> > - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> 
> Hmm.  So, ide drivers will be unloadable forever, without
> a chance to fix it someday? ;)

If you want removable IDE drivers use 2.4-ac or follow the libata work.
drivers/ide is on its way out. In fact Adrian, just deleting that
function would be a better patch.

Alan

Re: [2.6 patch] drivers/ide/: cleanups

[Benjamin Herrenschmidt]

On Tue, 2006-07-11 at 16:16 +0200, Adrian Bunk wrote:
> This patch contains the following clenups:
> - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> - ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)

Unused ? The PowerMac media-bay code uses it. It's not yet module-able
but I haven't given up on it just yet :)

Ben.


> - ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
> This patch was already sent on:
> - 9 Jul 2006
> - 26 Jun 2006
> - 27 Apr 2006
> - 19 Apr 2006
> - 11 Apr 2006
> 
>  drivers/ide/ide-dma.c   |    2 --
>  drivers/ide/ide.c       |    2 --
>  drivers/ide/setup-pci.c |    4 +++-
>  include/linux/ide.h     |    1 -
>  4 files changed, 3 insertions(+), 6 deletions(-)
> 
> --- linux-2.6.17-rc1-mm2-full/include/linux/ide.h.old	2006-04-10 22:46:27.000000000 +0200
> +++ linux-2.6.17-rc1-mm2-full/include/linux/ide.h	2006-04-10 22:46:36.000000000 +0200
> @@ -1188,7 +1188,6 @@
>  extern void ide_scan_pcibus(int scan_direction) __init;
>  extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
>  #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
> -extern void ide_pci_unregister_driver(struct pci_driver *driver);
>  void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
>  extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
>  
> --- linux-2.6.17-rc1-mm2-full/drivers/ide/ide.c.old	2006-04-10 22:43:31.000000000 +0200
> +++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide.c	2006-04-10 22:43:41.000000000 +0200
> @@ -826,8 +826,6 @@
>  	return ide_register_hw_with_fixup(hw, hwifp, NULL);
>  }
>  
> -EXPORT_SYMBOL(ide_register_hw);
> -
>  /*
>   *	Locks for IDE setting functionality
>   */
> --- linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c.old	2006-04-10 22:44:21.000000000 +0200
> +++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c	2006-04-10 22:44:28.000000000 +0200
> @@ -152,8 +152,6 @@
>  	return 0;
>  }
>  
> -EXPORT_SYMBOL_GPL(ide_in_drive_list);
> -
>  /**
>   *	ide_dma_intr	-	IDE DMA interrupt handler
>   *	@drive: the drive the interrupt is for
> --- linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c.old	2006-04-10 22:46:46.000000000 +0200
> +++ linux-2.6.17-rc1-mm2-full/drivers/ide/setup-pci.c	2006-04-10 22:47:03.000000000 +0200
> @@ -807,7 +807,8 @@
>   *	Unregister a currently installed IDE driver. Returns are the same
>   *	as for pci_unregister_driver
>   */
> - 
> +
> +#if 0
>  void ide_pci_unregister_driver(struct pci_driver *driver)
>  {
>  	if(!pre_init)
> @@ -817,6 +818,7 @@
>  }
>  
>  EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
> +#endif  /*  0  */
>  
>  /**
>   *	ide_scan_pcidev		-	find an IDE driver for a device
> 
> 
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ide" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [2.6 patch] drivers/ide/: cleanups

[Adrian Bunk]

On Fri, Jul 14, 2006 at 08:43:26PM +1000, Benjamin Herrenschmidt wrote:
> On Tue, 2006-07-11 at 16:16 +0200, Adrian Bunk wrote:
> > This patch contains the following clenups:
> > - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> > - ide.c: remove the unused EXPORT_SYMBOL(ide_register_hw)
> 
> Unused ? The PowerMac media-bay code uses it. It's not yet module-able
> but I haven't given up on it just yet :)

It's even used by drivers/ide/arm/bast-ide.c that can be modular (which 
I missed). -mm therefore contains the updated version I sent later in 
this thread that does no longer contain this unexport.

> Ben.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

[2.6 patch] drivers/ide/: cleanups

[Adrian Bunk]

On Tue, Jul 11, 2006 at 05:20:04PM +0100, Alan Cox wrote:
> Ar Maw, 2006-07-11 am 18:30 +0400, ysgrifennodd Michael Tokarev:
> > Adrian Bunk wrote:
> > > This patch contains the following clenups:
> > > - setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
> > 
> > Hmm.  So, ide drivers will be unloadable forever, without
> > a chance to fix it someday? ;)
> 
> If you want removable IDE drivers use 2.4-ac or follow the libata work.
> drivers/ide is on its way out. In fact Adrian, just deleting that
> function would be a better patch.

OK, below is a version doing this.

> Alan

cu
Adrian


<--  snip  -->



This patch contains the following clenups:
- setup-pci.c: remove the unused ide_pci_unregister_driver()
- ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/ide/ide-dma.c   |    2 --
 drivers/ide/setup-pci.c |   18 ------------------
 include/linux/ide.h     |    1 -
 3 files changed, 21 deletions(-)

--- linux-2.6.17-rc1-mm2-full/include/linux/ide.h.old	2006-04-10 22:46:27.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/include/linux/ide.h	2006-04-10 22:46:36.000000000 +0200
@@ -1188,7 +1188,6 @@
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
-extern void ide_pci_unregister_driver(struct pci_driver *driver);
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
 
--- linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c.old	2006-04-10 22:44:21.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/ide/ide-dma.c	2006-04-10 22:44:28.000000000 +0200
@@ -152,8 +152,6 @@
 	return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
 /**
  *	ide_dma_intr	-	IDE DMA interrupt handler
  *	@drive: the drive the interrupt is for
--- linux-2.6.18-rc1-mm2-full/drivers/ide/setup-pci.c.old	2006-07-15 01:11:47.000000000 +0200
+++ linux-2.6.18-rc1-mm2-full/drivers/ide/setup-pci.c	2006-07-15 01:12:02.000000000 +0200
@@ -795,24 +795,6 @@
 EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
 
 /**
- *	ide_unregister_pci_driver	-	unregister an IDE driver
- *	@driver: driver to remove
- *
- *	Unregister a currently installed IDE driver. Returns are the same
- *	as for pci_unregister_driver
- */
- 
-void ide_pci_unregister_driver(struct pci_driver *driver)
-{
-	if(!pre_init)
-		pci_unregister_driver(driver);
-	else
-		list_del(&driver->node);
-}
-
-EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
-
-/**
  *	ide_scan_pcidev		-	find an IDE driver for a device
  *	@dev: PCI device to check
  *