From: Kieran Bingham <kieranbingham@gmail.com>
To: Wolfram Sang <wsa@the-dreams.de>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
linus.walleij@linaro.org, grant.likely@linaro.org
Subject: [PATCH v4 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure
Date: Wed, 9 Sep 2015 19:33:47 +0100 [thread overview]
Message-ID: <1441823627-6227-9-git-send-email-kieranbingham@gmail.com> (raw)
In-Reply-To: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com>
From: Lee Jones <lee.jones@linaro.org>
Also remove unused second probe() parameter 'i2c_device_id'.
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/as3722.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 924ea90..6ac4be3 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -354,8 +354,7 @@ static int as3722_i2c_of_probe(struct i2c_client *i2c,
return 0;
}
-static int as3722_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int as3722_i2c_probe(struct i2c_client *i2c)
{
struct as3722 *as3722;
unsigned long irq_flags;
@@ -428,20 +427,13 @@ static const struct of_device_id as3722_of_match[] = {
};
MODULE_DEVICE_TABLE(of, as3722_of_match);
-static const struct i2c_device_id as3722_i2c_id[] = {
- { "as3722", 0 },
- {},
-};
-MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
-
static struct i2c_driver as3722_i2c_driver = {
.driver = {
.name = "as3722",
.of_match_table = as3722_of_match,
},
- .probe = as3722_i2c_probe,
+ .probe2 = as3722_i2c_probe,
.remove = as3722_i2c_remove,
- .id_table = as3722_i2c_id,
};
module_i2c_driver(as3722_i2c_driver);
--
2.1.4
next prev parent reply other threads:[~2015-09-09 18:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-09 18:33 [PATCH v4 0/8] i2c: Relax mandatory I2C ID table passing Kieran Bingham
[not found] ` <1441823627-6227-1-git-send-email-kieranbingham-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-09 18:33 ` [PATCH v4 1/8] i2c: Add pointer dereference protection to i2c_match_id() Kieran Bingham
2015-09-11 9:31 ` Lee Jones
2015-09-11 9:48 ` Kieran Bingham
2015-09-09 18:33 ` [PATCH v4 2/8] i2c: Add the ability to match device to compatible string without an of_node Kieran Bingham
2015-09-09 18:33 ` [PATCH v4 3/8] i2c: Match using traditional OF methods, then by vendor-less compatible strings Kieran Bingham
2015-09-11 9:31 ` Lee Jones
2015-09-09 18:33 ` [PATCH v4 4/8] i2c: Make I2C ID tables non-mandatory for DT'ed devices Kieran Bingham
[not found] ` <1441823627-6227-5-git-send-email-kieranbingham-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-11 9:31 ` Lee Jones
2015-09-09 18:33 ` [PATCH v4 5/8] i2c: Export i2c_match_id() for direct use by device drivers Kieran Bingham
[not found] ` <1441823627-6227-6-git-send-email-kieranbingham-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-11 9:30 ` Lee Jones
2015-09-09 18:33 ` [PATCH v4 6/8] i2c: Provide a temporary .probe2() call-back type Kieran Bingham
2015-09-09 18:33 ` [PATCH v4 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Kieran Bingham
[not found] ` <1441823627-6227-8-git-send-email-kieranbingham-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-11 9:29 ` Lee Jones
2015-09-09 18:33 ` Kieran Bingham [this message]
[not found] ` <1441823627-6227-9-git-send-email-kieranbingham-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-09-11 9:29 ` [PATCH v4 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Lee Jones
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=1441823627-6227-9-git-send-email-kieranbingham@gmail.com \
--to=kieranbingham@gmail.com \
--cc=grant.likely@linaro.org \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=wsa@the-dreams.de \
/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).