LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6 patch] small ide-scan-pci.c cleanup
@ 2008-01-28 22:09 Adrian Bunk
  2008-02-01 21:50 ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2008-01-28 22:09 UTC (permalink / raw)
  To: bzolnier; +Cc: linux-ide, linux-kernel

- 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 <bunk@kernel.org>

---

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

03f221931265eda3ae7dfad9eaa8191e171d2c0c 
diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c
index 7ffa332..93d2e41 100644
--- a/drivers/ide/ide-scan-pci.c
+++ b/drivers/ide/ide-scan-pci.c
@@ -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);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 5d3d88e..7072c53 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [2.6 patch] small ide-scan-pci.c cleanup
  2008-01-28 22:09 [2.6 patch] small ide-scan-pci.c cleanup Adrian Bunk
@ 2008-02-01 21:50 ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 2+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-02-01 21:50 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: linux-ide, linux-kernel

On Monday 28 January 2008, Adrian Bunk wrote:
> - 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 <bunk@kernel.org>

applied

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-02-01 22:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-28 22:09 [2.6 patch] small ide-scan-pci.c cleanup Adrian Bunk
2008-02-01 21:50 ` Bartlomiej Zolnierkiewicz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).