From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: andreas@gaisler.com, kernel@pengutronix.de, wg@grandegger.com,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [RFC: PATCH 1/5] can: sja1000_platform: add __dev{init,exit} annotations
Date: Fri, 5 Oct 2012 16:39:03 +0200 [thread overview]
Message-ID: <1349447947-18451-2-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1349447947-18451-1-git-send-email-mkl@pengutronix.de>
This patch add "__devinit", "__devexit" and "__devexit_p" annotations to the
sja1000_platform driver.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/sja1000/sja1000_platform.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 662c5f7..80f0d67 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -66,7 +66,7 @@ static void sp_write_reg32(const struct sja1000_priv *priv, int reg, u8 val)
iowrite8(val, priv->reg_base + reg * 4);
}
-static int sp_probe(struct platform_device *pdev)
+static int __devinit sp_probe(struct platform_device *pdev)
{
int err;
void __iomem *addr;
@@ -158,7 +158,7 @@ static int sp_probe(struct platform_device *pdev)
return err;
}
-static int sp_remove(struct platform_device *pdev)
+static int __devexit sp_remove(struct platform_device *pdev)
{
struct net_device *dev = dev_get_drvdata(&pdev->dev);
struct sja1000_priv *priv = netdev_priv(dev);
@@ -180,7 +180,7 @@ static int sp_remove(struct platform_device *pdev)
static struct platform_driver sp_driver = {
.probe = sp_probe,
- .remove = sp_remove,
+ .remove = __devexit_p(sp_remove),
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
--
1.7.10
next prev parent reply other threads:[~2012-10-05 14:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 14:39 [RFC: PATCH 1/5] can: sja1000_platform Marc Kleine-Budde
2012-10-05 14:39 ` Marc Kleine-Budde [this message]
2012-10-05 14:39 ` [RFC: PATCH 2/5] can: sja1000_platform: convert ioremap_nocache to devm_request_and_ioremap Marc Kleine-Budde
2012-10-05 14:39 ` [RFC: PATCH 3/5] can: sja1000_platform: replace DRV_NAME by KBUILD_MODNAME Marc Kleine-Budde
2012-10-05 14:39 ` [RFC: PATCH 4/5] can: sja1000_platform: factor out initialization from platform data Marc Kleine-Budde
2012-10-05 14:39 ` [RFC: PATCH 5/5] can: sja1000_platform: add device tree bindings Marc Kleine-Budde
2012-10-05 15:47 ` Wolfgang Grandegger
2012-10-05 16:42 ` Marc Kleine-Budde
2012-10-05 16:58 ` Wolfgang Grandegger
2012-10-08 9:16 ` [RFC: PATCH 1/5] can: sja1000_platform Andreas Larsson
2012-10-08 12:19 ` Marc Kleine-Budde
2012-10-08 12:50 ` Andreas Larsson
2012-10-09 13:30 ` Andreas Larsson
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=1349447947-18451-2-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=andreas@gaisler.com \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=wg@grandegger.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;
as well as URLs for NNTP newsgroup(s).