From: Namhyung Kim <namhyung@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>, Martyn Welch <martyn.welch@ge.com>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Staging: vme_tsi148: use __dev{init,exit} for ->probe/remove
Date: Sun, 12 Dec 2010 17:04:28 +0900 [thread overview]
Message-ID: <1292141068-31458-2-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1292141068-31458-1-git-send-email-namhyung@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
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
next prev parent reply other threads:[~2010-12-12 8:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-12 8:04 [PATCH 1/2] Staging: vme_ca91cx42: " Namhyung Kim
2010-12-12 8:04 ` Namhyung Kim [this message]
2010-12-13 18:26 ` Greg KH
2010-12-14 4:43 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292141068-31458-2-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=martyn.welch@ge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®