Skip to contentSkip to conversation

small ide-scan-pci.c cleanup

PATCH Applied Adrian Bunk 2 participants 2 messages Jan 28, 2008 – Feb 1, 2008 libata

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 small ide-scan-pci.c cleanup

- ide_scan_pcibus() can become static
- instead of ide_scan_pci() we can use ide_scan_pcibus() directly in module_init()

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

---

 drivers/ide/ide-scan-pci.c |    9 ++-------
 include/linux/ide.h        |    1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

03f221931265eda3ae7dfad9eaa8191e171d2c0c

drivers/ide/ide-scan-pci.c +2 -7
index 7ffa332..93d2e41 100644
@@ -81,7 +81,7 @@ static int __init ide_scan_pcidev(struct pci_dev *dev)
  *	module ordering not traditionally ordered.
  */
 
-int __init ide_scan_pcibus(void)
+static int __init ide_scan_pcibus(void)
 {
 	struct pci_dev *dev = NULL;
 	struct pci_driver *d;

@@ -113,9 +113,4 @@ int __init ide_scan_pcibus(void)
 	return 0;
 }
 
-static int __init ide_scan_pci(void)
-{
-	return ide_scan_pcibus();
-}
-
-module_init(ide_scan_pci);
+module_init(ide_scan_pcibus);
include/linux/ide.h +0 -1
index 5d3d88e..7072c53 100644
@@ -1015,7 +1015,6 @@ void ide_init_disk(struct gendisk *, ide_drive_t *);
 
 #ifdef CONFIG_IDEPCI_PCIBUS_ORDER
 extern int ide_scan_direction;
-int __init ide_scan_pcibus(void);
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME)
 #else