2007-02-14 00:40:42

by Richard Knutsson

Subject: [PATCH] mtd/maps/ck804xrom.c: pci_module_init to pci_register_driver

Convert pci_module_init() to pci_register_driver().

Signed-off-by: Richard Knutsson <[email protected]>
---
Compile-tested with "allyes", "allmod" & "allno" on i386


diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 238d42e..1998172 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -310,15 +310,6 @@ static struct pci_device_id ck804xrom_pci_tbl[] = {

MODULE_DEVICE_TABLE(pci, ck804xrom_pci_tbl);

-#if 0
-static struct pci_driver ck804xrom_driver = {
- .name = MOD_NAME,
- .id_table = ck804xrom_pci_tbl,
- .probe = ck804xrom_init_one,
- .remove = ck804xrom_remove_one,
-};
-#endif
-
static int __init init_ck804xrom(void)
{
struct pci_dev *pdev;
@@ -337,9 +328,6 @@ static int __init init_ck804xrom(void)
return retVal;
}
return -ENXIO;
-#if 0
- return pci_module_init(&ck804xrom_driver);
-#endif
}

static void __exit cleanup_ck804xrom(void)

2007-02-14 00:55:22

by Richard Knutsson

Subject: [PATCH] mtd/maps/ck804xrom.c: Remove #if 0'ed code

Remove #if 0'ed code (to get rid of pci_module_init()).

Signed-off-by: Richard Knutsson <[email protected]>
---
Compile-tested with "allyes", "allmod" & "allno" on i386
More suitable description, sorry for the noise


diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 238d42e..1998172 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -310,15 +310,6 @@ static struct pci_device_id ck804xrom_pci_tbl[] = {

MODULE_DEVICE_TABLE(pci, ck804xrom_pci_tbl);

-#if 0
-static struct pci_driver ck804xrom_driver = {
- .name = MOD_NAME,
- .id_table = ck804xrom_pci_tbl,
- .probe = ck804xrom_init_one,
- .remove = ck804xrom_remove_one,
-};
-#endif
-
static int __init init_ck804xrom(void)
{
struct pci_dev *pdev;
@@ -337,9 +328,6 @@ static int __init init_ck804xrom(void)
return retVal;
}
return -ENXIO;
-#if 0
- return pci_module_init(&ck804xrom_driver);
-#endif
}

static void __exit cleanup_ck804xrom(void)