2010-12-12 08:04:58

by Namhyung Kim

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

Signed-off-by: Namhyung Kim <[email protected]>
---
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

2010-12-12 08:05:05

by Namhyung Kim

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

Signed-off-by: Namhyung Kim <[email protected]>
---
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

2010-12-13 18:36:08

by Greg KH

Subject: Re: [PATCH 1/2] Staging: vme_ca91cx42: use __dev{init,exit} for ->probe/remove

On Sun, Dec 12, 2010 at 05:04:27PM +0900, Namhyung Kim wrote:
> Signed-off-by: Namhyung Kim <[email protected]>
> ---
> drivers/staging/vme/bridges/vme_ca91cx42.c | 12 +++++++-----

This patch does not apply to the linux-next tree, what did you generate
it against?

Also, why are you marking these functions, is it really needed? Same
thing for your 2/2 patch.

thanks,

greg k-h

2010-12-14 04:43:29

by Namhyung Kim

Subject: Re: [PATCH 1/2] Staging: vme_ca91cx42: use __dev{init,exit} for ->probe/remove

2010-12-13 (월), 10:26 -0800, Greg KH:
> On Sun, Dec 12, 2010 at 05:04:27PM +0900, Namhyung Kim wrote:
> > Signed-off-by: Namhyung Kim <[email protected]>
> > ---
> > drivers/staging/vme/bridges/vme_ca91cx42.c | 12 +++++++-----
>
> This patch does not apply to the linux-next tree, what did you generate
> it against?
>

Argh.. sorry, it was Linus's tree. Will resend if you want.


> Also, why are you marking these functions, is it really needed? Same
> thing for your 2/2 patch.
>

?? Maybe I don't get what you mean exactly.. They are hotplugging
stuffs, right? So shouldn't they be marked as such?


--
Regards,
Namhyung Kim