devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: wsa@the-dreams.de, grant.likely@linaro.org,
	linus.walleij@linaro.org, linux-i2c@vger.kernel.org,
	devicetree@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 8/9] mfd: 88pm860x: Move over to new I2C device .probe() call
Date: Fri,  6 Jun 2014 16:52:31 +0100	[thread overview]
Message-ID: <1402069952-28022-9-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1402069952-28022-1-git-send-email-lee.jones@linaro.org>

As part of an effort to rid the mostly unused second parameter for I2C
related .probe() functions and to conform to other existing frameworks
we're moving over to a temporary replacement .probe() call-back.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/88pm860x-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index bcfc9e8..d763f1f 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1127,8 +1127,7 @@ static int pm860x_dt_init(struct device_node *np,
 	return 0;
 }
 
-static int pm860x_probe(struct i2c_client *client,
-				  const struct i2c_device_id *id)
+static int pm860x_probe(struct i2c_client *client)
 {
 	struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);
 	struct device_node *node = client->dev.of_node;
@@ -1255,7 +1254,7 @@ static struct i2c_driver pm860x_driver = {
 		.pm     = &pm860x_pm_ops,
 		.of_match_table	= pm860x_dt_ids,
 	},
-	.probe		= pm860x_probe,
+	.probe2		= pm860x_probe,
 	.remove		= pm860x_remove,
 	.id_table	= pm860x_id_table,
 };
-- 
1.8.3.2

  parent reply	other threads:[~2014-06-06 15:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-06 15:52 [PATCH 0/9] i2c: Relax mandatory I2C ID table passing (+ some creep) Lee Jones
2014-06-06 15:52 ` [PATCH 1/9] i2c: Add pointer dereference protection to i2c_match_id() Lee Jones
2014-06-06 22:59   ` Grant Likely
2014-06-06 15:52 ` [PATCH 2/9] i2c: Add the ability to match device to compatible string without an of_node Lee Jones
2014-06-06 15:52 ` [PATCH 3/9] i2c: Match using traditional OF methods, then by vendor-less compatible strings Lee Jones
     [not found]   ` <1402069952-28022-4-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-06-06 23:19     ` Grant Likely
2014-06-06 15:52 ` [PATCH 4/9] i2c: Make I2C ID tables non-mandatory for DT'ed devices Lee Jones
     [not found] ` <1402069952-28022-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-06-06 15:52   ` [PATCH 5/9] i2c: Export i2c_match_id() for direct use by device drivers Lee Jones
2014-06-06 15:52   ` [PATCH 7/9] of/device: Allow I2C devices to OF match without supplying an OF node Lee Jones
     [not found]     ` <1402069952-28022-8-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-06-06 23:28       ` Grant Likely
2014-06-06 15:52 ` [PATCH 6/9] i2c: Provide a temporary .probe2() call-back type Lee Jones
2014-06-06 15:52 ` Lee Jones [this message]
2014-06-06 15:52 ` [PATCH 9/9] mfd: as3722: Rid driver of superfluous I2C device ID structure Lee Jones
2014-06-06 23:33 ` [PATCH 0/9] i2c: Relax mandatory I2C ID table passing (+ some creep) Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2014-06-20 12:02 [PATCH v3 0/7] i2c: Relax mandatory I2C ID table passing Lee Jones
2014-06-20 12:02 ` [PATCH 8/9] mfd: 88pm860x: Move over to new I2C device .probe() call 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=1402069952-28022-9-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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).