From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/14] Regulators: max8660 - annotate probe and remove methods
Date: Tue, 23 Feb 2010 23:38:28 -0800 [thread overview]
Message-ID: <20100224073828.15964.55037.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100224073342.15964.8863.stgit@localhost.localdomain>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/regulator/max8660.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index acc2fb7..f12f1bb 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -345,8 +345,8 @@ static struct regulator_desc max8660_reg[] = {
},
};
-static int max8660_probe(struct i2c_client *client,
- const struct i2c_device_id *i2c_id)
+static int __devinit max8660_probe(struct i2c_client *client,
+ const struct i2c_device_id *i2c_id)
{
struct regulator_dev **rdev;
struct max8660_platform_data *pdata = client->dev.platform_data;
@@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client,
int boot_on, i, id, ret = -EINVAL;
if (pdata->num_subdevs > MAX8660_V_END) {
- dev_err(&client->dev, "Too much regulators found!\n");
+ dev_err(&client->dev, "Too many regulators found!\n");
goto out;
}
@@ -462,7 +462,7 @@ out:
return ret;
}
-static int max8660_remove(struct i2c_client *client)
+static int __devexit max8660_remove(struct i2c_client *client)
{
struct regulator_dev **rdev = i2c_get_clientdata(client);
int i;
@@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
static struct i2c_driver max8660_driver = {
.probe = max8660_probe,
- .remove = max8660_remove,
+ .remove = __devexit_p(max8660_remove),
.driver = {
.name = "max8660",
+ .owner = THIS_MODULE,
},
.id_table = max8660_id,
};
next prev parent reply other threads:[~2010-02-24 7:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 7:37 [PATCH 00/14] Assorted small patches for regulators Dmitry Torokhov
2010-02-24 7:37 ` [PATCH 01/14] Regulators: virtual - use sysfs attribute groups Dmitry Torokhov
2010-02-24 10:50 ` Mark Brown
2010-02-25 10:35 ` Liam Girdwood
2010-02-24 7:37 ` [PATCH 02/14] Regulators: ab3100 - fix probe and remove annotations Dmitry Torokhov
2010-02-24 10:03 ` Mark Brown
2010-02-25 10:36 ` Liam Girdwood
2010-02-24 7:37 ` [PATCH 03/14] Regulators: fixed - annotate probe and remove methods Dmitry Torokhov
2010-02-24 10:43 ` Mark Brown
2010-02-25 10:36 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 04/14] Regulators: twl-regulator - mark probe function as __devinit Dmitry Torokhov
2010-02-24 10:05 ` Mark Brown
2010-02-25 10:36 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 05/14] Regulators: tps65023-regulator - mark probe method " Dmitry Torokhov
2010-02-24 11:31 ` Mark Brown
2010-02-25 10:37 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 06/14] Regulators: tps6507x-regulator " Dmitry Torokhov
2010-02-24 11:32 ` Mark Brown
2010-02-25 10:37 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 07/14] Regulators: lp3971 - fail if platform data was not supplied Dmitry Torokhov
2010-02-24 12:11 ` Mark Brown
2010-02-25 10:37 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 08/14] Regulators: max1586 - annotate probe and remove methods Dmitry Torokhov
2010-02-24 10:06 ` Mark Brown
2010-02-24 10:16 ` Dmitry Torokhov
2010-02-25 10:37 ` Liam Girdwood
2010-02-24 7:38 ` Dmitry Torokhov [this message]
2010-02-24 10:07 ` [PATCH 09/14] Regulators: max8660 " Mark Brown
2010-02-25 10:37 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 10/14] Regulators: pcap-regulator - clean up driver data after removal Dmitry Torokhov
2010-02-24 10:36 ` Mark Brown
2010-02-25 10:38 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 11/14] Regulators: wm831x-xxx " Dmitry Torokhov
2010-02-24 10:36 ` Mark Brown
2010-02-25 10:38 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 12/14] Regulators: wm8994 " Dmitry Torokhov
2010-02-24 10:20 ` Mark Brown
2010-02-25 10:39 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 13/14] Regulators: wm8400 - cleanup platform driver data handling Dmitry Torokhov
2010-02-24 10:25 ` Mark Brown
2010-02-24 19:02 ` Dmitry Torokhov
2010-02-24 19:14 ` Mark Brown
2010-02-24 19:21 ` Dmitry Torokhov
2010-02-24 20:40 ` Mark Brown
2010-02-25 9:55 ` Dmitry Torokhov
2010-02-25 10:43 ` Mark Brown
2010-02-25 11:02 ` Liam Girdwood
2010-02-24 7:38 ` [PATCH 14/14] Regulators: max8925-regulator - clean up driver data after removal Dmitry Torokhov
2010-02-24 10:28 ` Mark Brown
2010-02-25 10:39 ` Liam Girdwood
2010-02-24 10:03 ` [PATCH 00/14] Assorted small patches for regulators Mark Brown
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=20100224073828.15964.55037.stgit@localhost.localdomain \
--to=dmitry.torokhov@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
/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