Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
---
drivers/staging/vme/bridges/vme_ca91cx42.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 7db44fe32762..d1df7d12f504 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -35,8 +35,9 @@
#include "vme_ca91cx42.h"
static int __init ca91cx42_init(void);
-static int ca91cx42_probe(struct pci_dev *, const struct pci_device_id *);
-static void ca91cx42_remove(struct pci_dev *);
+static int __devinit ca91cx42_probe(struct pci_dev *,
+ const struct pci_device_id *);
+static void __devexit ca91cx42_remove(struct pci_dev *);
static void __exit ca91cx42_exit(void);
/* Module parameters */
@@ -53,7 +54,7 @@ static struct pci_driver ca91cx42_driver = {
.name = driver_name,
.id_table = ca91cx42_ids,
.probe = ca91cx42_probe,
- .remove = ca91cx42_remove,
+ .remove = __devexit_p(ca91cx42_remove),
};
static u32 ca91cx42_DMA_irqhandler(struct ca91cx42_driver *bridge)
@@ -1565,7 +1566,8 @@ static void ca91cx42_crcsr_exit(struct vme_bridge *ca91cx42_bridge,
bridge->crcsr_bus);
}
-static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit ca91cx42_probe(struct pci_dev *pdev,
+ const struct pci_device_id *id)
{
int retval, i;
u32 data;
@@ -1831,7 +1833,7 @@ err_struct:
}
-void ca91cx42_remove(struct pci_dev *pdev)
+void __devexit ca91cx42_remove(struct pci_dev *pdev)
{
struct list_head *pos = NULL;
struct vme_master_resource *master_image;
--
1.7.3.3.400.g93cef
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
