linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kieran Bingham <kieran@ksquared.org.uk>
To: Wolfram Sang <wsa@the-dreams.de>,
	Lee Jones <lee.jones@linaro.org>,
	Kieran Bingham <kieran@ksquared.org.uk>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
	Javier Martinez Canillas <javier@osg.samsung.com>,
	sameo@linux.intel.com
Subject: [PATCHv7 10/11] mfd: as3722: Rid driver of superfluous I2C device ID structure
Date: Mon,  7 Nov 2016 12:47:45 +0000	[thread overview]
Message-ID: <1478522866-29620-11-git-send-email-kieran@bingham.xyz> (raw)
In-Reply-To: <1478522866-29620-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 f87342c211bc..7d8c5e4136e2 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;
@@ -441,12 +440,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)
 };
@@ -457,8 +450,7 @@ static struct i2c_driver as3722_i2c_driver = {
 		.of_match_table = as3722_of_match,
 		.pm = &as3722_pm_ops,
 	},
-	.probe = as3722_i2c_probe,
-	.id_table = as3722_i2c_id,
+	.probe_new = as3722_i2c_probe,
 };
 
 module_i2c_driver(as3722_i2c_driver);
-- 
2.7.4

  parent reply	other threads:[~2016-11-07 12:48 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-07 12:47 [PATCHv7 00/11] i2c: Relax mandatory I2C ID table passing Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 01/11] i2c: Add pointer dereference protection to i2c_match_id() Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 02/11] i2c: Add the ability to match device to compatible string without an of_node Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 03/11] i2c: Match using traditional OF methods, then by vendor-less compatible strings Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 04/11] i2c: Make I2C ID tables non-mandatory for DT'ed devices Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 05/11] i2c: Export i2c_match_id() for direct use by device drivers Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 06/11] i2c: Provide a temporary .probe_new() call-back type Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 07/11] i2c: match dt-style device names from sysfs interface Kieran Bingham
2016-11-07 19:10   ` Javier Martinez Canillas
2016-11-14 22:27   ` Wolfram Sang
2016-11-15  9:48     ` Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 08/11] i2c: match vendorless strings on the internal string length Kieran Bingham
2016-11-07 19:12   ` Javier Martinez Canillas
2016-11-14 22:27   ` Wolfram Sang
2016-11-15  9:49     ` Kieran Bingham
2016-11-07 12:47 ` [PATCHv7 09/11] mfd: 88pm860x: Move over to new I2C device .probe() call Kieran Bingham
2016-11-07 19:13   ` Javier Martinez Canillas
2016-11-07 12:47 ` Kieran Bingham [this message]
2016-11-07 19:20   ` [PATCHv7 10/11] mfd: as3722: Rid driver of superfluous I2C device ID structure Javier Martinez Canillas
2016-11-07 22:05     ` Kieran Bingham
2016-11-08  2:02       ` Javier Martinez Canillas
2016-11-07 23:09     ` Wolfram Sang
2016-11-08  2:14       ` Javier Martinez Canillas
2016-11-07 12:47 ` [PATCHv7 11/11] [TESTPATCH] rtc: convert ds1307 to interim probe_new Kieran Bingham
2016-11-13 18:26 ` [PATCHv7 00/11] i2c: Relax mandatory I2C ID table passing Wolfram Sang
2016-11-17 21:15 ` Wolfram Sang

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=1478522866-29620-11-git-send-email-kieran@bingham.xyz \
    --to=kieran@ksquared.org.uk \
    --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).