From: Kieran Bingham <kieran@ksquared.org.uk>
To: Wolfram Sang <wsa@the-dreams.de>,
Lee Jones <lee.jones@linaro.org>,
javier@osg.samsung.com
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
grant.likely@linaro.org, sameo@linux.intel.com,
Kieran Bingham <kieran@ksquared.org.uk>
Subject: [PATCHv5 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure
Date: Wed, 4 May 2016 16:14:48 +0100 [thread overview]
Message-ID: <1462374888-22888-9-git-send-email-kieran@bingham.xyz> (raw)
In-Reply-To: <1462374888-22888-1-git-send-email-kieran@bingham.xyz>
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>
Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
---
Changes since v4
- Rename .probe2 to probe_new
---
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 e1f597f97f86..28fc62af6861 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;
@@ -453,12 +452,6 @@ 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 const struct dev_pm_ops as3722_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(as3722_i2c_suspend, as3722_i2c_resume)
};
@@ -469,9 +462,8 @@ static struct i2c_driver as3722_i2c_driver = {
.of_match_table = as3722_of_match,
.pm = &as3722_pm_ops,
},
- .probe = as3722_i2c_probe,
+ .probe_new = as3722_i2c_probe,
.remove = as3722_i2c_remove,
- .id_table = as3722_i2c_id,
};
module_i2c_driver(as3722_i2c_driver);
--
2.5.0
next prev parent reply other threads:[~2016-05-04 15:15 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 15:14 [PATCHv5 0/8] 2c: Relax mandatory I2C ID table passing Kieran Bingham
2016-05-04 15:14 ` [PATCHv5 1/8] i2c: Add pointer dereference protection to i2c_match_id() Kieran Bingham
2016-05-10 4:54 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 2/8] i2c: Add the ability to match device to compatible string without an of_node Kieran Bingham
2016-05-10 4:57 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 3/8] i2c: Match using traditional OF methods, then by vendor-less compatible strings Kieran Bingham
2016-05-10 4:58 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 4/8] i2c: Make I2C ID tables non-mandatory for DT'ed devices Kieran Bingham
2016-05-10 5:01 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 5/8] i2c: Export i2c_match_id() for direct use by device drivers Kieran Bingham
2016-05-10 5:02 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 6/8] i2c: Provide a temporary .probe_new() call-back type Kieran Bingham
2016-05-10 5:04 ` Javier Martinez Canillas
2016-05-04 15:14 ` [PATCHv5 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Kieran Bingham
2016-05-10 5:07 ` Javier Martinez Canillas
2016-05-04 15:14 ` Kieran Bingham [this message]
2016-05-10 5:20 ` [PATCHv5 8/8] mfd: as3722: Rid driver of superfluous I2C device ID structure Javier Martinez Canillas
2016-05-10 7:33 ` Lee Jones
2016-05-10 13:23 ` Javier Martinez Canillas
2016-05-10 14:01 ` Lee Jones
2016-05-10 14:39 ` [PATCH] cocci: Find i2c drivers with an of_device table that isn't exported Kieran Bingham
2016-05-10 15:07 ` [PATCH] cocci: Provide script to find i2c_tables missing exports Kieran Bingham
2016-05-11 20:07 ` Javier Martinez Canillas
2016-05-09 9:14 ` [PATCHv5 0/8] 2c: Relax mandatory I2C ID table passing Lee Jones
2016-05-09 13:21 ` Javier Martinez Canillas
2016-05-10 5:31 ` Javier Martinez Canillas
2016-05-10 7:48 ` Kieran Bingham
2016-06-09 14:24 ` Lee Jones
2016-06-09 19:15 ` Wolfram Sang
2016-06-09 19:45 ` Javier Martinez Canillas
2016-06-09 20:04 ` Wolfram Sang
2016-06-10 10:03 ` Kieran Bingham
2016-06-10 11:00 ` Wolfram Sang
2016-06-10 12:07 ` Kieran Bingham
2016-06-10 13:32 ` Wolfram Sang
2016-06-12 21:13 ` [TEST PATCH] rtc: convert ds1307 to interim probe_new Kieran Bingham
2016-06-12 21:26 ` kbuild test robot
2016-06-12 21:26 ` kbuild test robot
2016-06-13 17:13 ` Wolfram Sang
2016-07-11 9:13 ` Kieran Bingham
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=1462374888-22888-9-git-send-email-kieran@bingham.xyz \
--to=kieran@ksquared.org.uk \
--cc=grant.likely@linaro.org \
--cc=javier@osg.samsung.com \
--cc=lee.jones@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).