[PATCH 2/2] Staging: vme_tsi148: use __dev{init,exit} for ->probe/remove

From: Namhyung Kim
Date: Sun Dec 12 2010 - 03:05:16 EST


Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
---
drivers/staging/vme/bridges/vme_tsi148.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 2f5b70986998..0ec9fa4768c2 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -35,8 +35,9 @@
#include "vme_tsi148.h"

static int __init tsi148_init(void);
-static int tsi148_probe(struct pci_dev *, const struct pci_device_id *);
-static void tsi148_remove(struct pci_dev *);
+static int __devinit tsi148_probe(struct pci_dev *,
+ const struct pci_device_id *);
+static void __devexit tsi148_remove(struct pci_dev *);
static void __exit tsi148_exit(void);


@@ -55,7 +56,7 @@ static struct pci_driver tsi148_driver = {
.name = driver_name,
.id_table = tsi148_ids,
.probe = tsi148_probe,
- .remove = tsi148_remove,
+ .remove = __devexit_p(tsi148_remove),
};

static void reg_join(unsigned int high, unsigned int low,
@@ -2215,7 +2216,8 @@ static void tsi148_crcsr_exit(struct vme_bridge *tsi148_bridge,
bridge->crcsr_bus);
}

-static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit tsi148_probe(struct pci_dev *pdev,
+ const struct pci_device_id *id)
{
int retval, i, master_num;
u32 data;
@@ -2528,7 +2530,7 @@ err_struct:

}

-static void tsi148_remove(struct pci_dev *pdev)
+static void __devexit tsi148_remove(struct pci_dev *pdev)
{
struct list_head *pos = NULL;
struct vme_master_resource *master_image;
--
1.7.3.3.400.g93cef

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/