Skip to contentSkip to conversation

drivers/ide/: possible cleanups

PATCH In review Adrian Bunk 3 participants 4 messages Apr 30, 2005 – May 2, 2005 libata

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 drivers/ide/: possible cleanups

This patch contains the following possible cleanups:
- pci/cy82c693.c: make a needlessly global function static
- remove the following unneeded EXPORT_SYMBOL's:
- ide-taskfile.c: do_rw_taskfile
- ide-iops.c: default_hwif_iops
- ide-iops.c: default_hwif_transport
- ide-iops.c: wait_for_ready

Signed-off-by Adrian Bunk <[email protected]>

---

This patch was already sent on:
- 17 Apr 2005

 drivers/ide/ide-iops.c     |    6 ------
 drivers/ide/ide-taskfile.c |    2 --
 drivers/ide/pci/cy82c693.c |    2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)
drivers/ide/ide-taskfile.c renamed from drivers/ide/ide-taskfile.c.old +0 -2
@@ -161,8 +161,6 @@
 	return ide_stopped;
 }
 
-EXPORT_SYMBOL(do_rw_taskfile);
-
 /*
  * set_multmode_intr() is invoked on completion of a WIN_SETMULT cmd.
  */
drivers/ide/pci/cy82c693.c renamed from drivers/ide/pci/cy82c693.c.old +1 -1
@@ -469,7 +469,7 @@
 
 static __initdata ide_hwif_t *primary;
 
-void __init init_iops_cy82c693(ide_hwif_t *hwif)
+static void __init init_iops_cy82c693(ide_hwif_t *hwif)
 {
 	if (PCI_FUNC(hwif->pci_dev->devfn) == 1)
 		primary = hwif;
drivers/ide/ide-iops.c renamed from drivers/ide/ide-iops.c.old +0 -6
@@ -104,8 +104,6 @@
 	hwif->INSL	= ide_insl;
 }
 
-EXPORT_SYMBOL(default_hwif_iops);
-
 /*
  *	MMIO operations, typically used for SATA controllers
  */

@@ -329,8 +327,6 @@
 	hwif->atapi_output_bytes	= atapi_output_bytes;
 }
 
-EXPORT_SYMBOL(default_hwif_transport);
-
 /*
  * Beginning of Taskfile OPCODE Library and feature sets.
  */

@@ -525,8 +525,6 @@
 	return 0;
 }
 
-EXPORT_SYMBOL(wait_for_ready);
-
 /*
  * This routine busy-waits for the drive status to be not "busy".
  * It then checks the status for all of the "good" bits and none
#1 lore raw
Quoted 7 lines · Adrian Bunk

This patch contains the following possible cleanups:
- pci/cy82c693.c: make a needlessly global function static
- remove the following unneeded EXPORT_SYMBOL's:
- ide-taskfile.c: do_rw_taskfile
- ide-iops.c: default_hwif_iops
- ide-iops.c: default_hwif_transport
- ide-iops.c: wait_for_ready

default_*_ops are very much API items not currently used. You need them if you
want to switch from mmio back to pio (eg doing S3 resume) although nobody is currently doing that.

wait_for_ready used to be used by ide-probe as a module so seems sane.

author
#2 lore raw
Quoted 9 lines · Alan Cox
Quoted 7 lines · Adrian Bunk

This patch contains the following possible cleanups:
- pci/cy82c693.c: make a needlessly global function static
- remove the following unneeded EXPORT_SYMBOL's:
- ide-taskfile.c: do_rw_taskfile
- ide-iops.c: default_hwif_iops
- ide-iops.c: default_hwif_transport
- ide-iops.c: wait_for_ready

Quoted 4 lines

default_*_ops are very much API items not currently used. You need them if you
want to switch from mmio back to pio (eg doing S3 resume) although nobody is currently doing that.

My patch only removes the EXPORT_SYMBOL's.

The functions themselves stay (since they are used), and if someone wants at some time in the future use them from a module, re-adding them will be trivial.

Quoted 1 line

wait_for_ready used to be used by ide-probe as a module so seems sane.

cu
Adrian

Signature · 4 lines
       "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
#3 lore raw
Quoted 15 lines · Adrian Bunk
Quoted 9 lines · Alan Cox
Quoted 7 lines · Adrian Bunk

This patch contains the following possible cleanups:
- pci/cy82c693.c: make a needlessly global function static
- remove the following unneeded EXPORT_SYMBOL's:
- ide-taskfile.c: do_rw_taskfile
- ide-iops.c: default_hwif_iops
- ide-iops.c: default_hwif_transport
- ide-iops.c: wait_for_ready

Quoted 4 lines

default_*_ops are very much API items not currently used. You need them if you
want to switch from mmio back to pio (eg doing S3 resume) although nobody is currently doing that.

Quoted 5 lines

My patch only removes the EXPORT_SYMBOL's.

The functions themselves stay (since they are used), and if someone wants at some time in the future use them from a module, re-adding them will be trivial.

Hrm... well, that means if I ever want ide-pmac for example to be a module, I'll have to add them back...

On the other hand, I agree that their names aren't very nice for exported symbols... they should have been ide_*

Ben.