linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Angel Iglesias <ang.iglesiasg@gmail.com>,
	Lee Jones <lee.jones@linaro.org>,
	Grant Likely <grant.likely@linaro.org>,
	Wolfram Sang <wsa@kernel.org>, Colin Leroy <colin@colino.net>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-i2c@vger.kernel.org, kernel@pengutronix.de,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: [PATCH 290/606] macintosh: therm_adt746x: Convert to i2c's .probe_new()
Date: Fri, 18 Nov 2022 23:40:24 +0100	[thread overview]
Message-ID: <20221118224540.619276-291-uwe@kleine-koenig.org> (raw)
In-Reply-To: <20221118224540.619276-1-uwe@kleine-koenig.org>

From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/macintosh/therm_adt746x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index b004ea2a1102..8f5db9093c9a 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -464,9 +464,9 @@ static void thermostat_remove_files(struct thermostat *th)
 
 }
 
-static int probe_thermostat(struct i2c_client *client,
-			    const struct i2c_device_id *id)
+static int probe_thermostat(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct device_node *np = client->dev.of_node;
 	struct thermostat* th;
 	const __be32 *prop;
@@ -598,7 +598,7 @@ static struct i2c_driver thermostat_driver = {
 	.driver = {
 		.name	= "therm_adt746x",
 	},
-	.probe = probe_thermostat,
+	.probe_new = probe_thermostat,
 	.remove = remove_thermostat,
 	.id_table = therm_adt746x_id,
 };
-- 
2.38.1


  parent reply	other threads:[~2022-11-18 23:14 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-18 22:35 [PATCH 000/606] i2c: Complete conversion to i2c_probe_new Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 289/606] macintosh: ams/ams-i2c: Convert to i2c's .probe_new() Uwe Kleine-König
2022-11-19  7:38   ` Christophe Leroy
2022-11-19 10:16     ` Uwe Kleine-König
2022-11-18 22:40 ` Uwe Kleine-König [this message]
2022-11-18 22:40 ` [PATCH 291/606] macintosh: therm_windtunnel: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 292/606] macintosh: windfarm_ad7417_sensor: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 293/606] macintosh: windfarm_fcu_controls: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 294/606] macintosh: windfarm_lm75_sensor: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 295/606] macintosh: windfarm_lm87_sensor: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 296/606] macintosh: windfarm_max6690_sensor: " Uwe Kleine-König
2022-11-18 22:40 ` [PATCH 297/606] macintosh: windfarm_smu_sat: " Uwe Kleine-König
2022-11-18 22:45 ` [PATCH 597/606] ALSA: aoa: onyx: " Uwe Kleine-König
2022-11-19  8:44   ` Takashi Iwai
2022-11-18 22:45 ` [PATCH 598/606] ALSA: aoa: tas: " Uwe Kleine-König
2022-11-19  8:45   ` Takashi Iwai
2022-11-19  6:50 ` [PATCH 000/606] i2c: Complete conversion to i2c_probe_new patchwork-bot+chrome-platform
2022-11-19  6:50 ` patchwork-bot+chrome-platform
2022-11-19 11:10 ` Wolfram Sang
2022-11-20 19:43 ` Sebastian Reichel
2022-11-21  9:53 ` Lee Jones
2022-11-22 18:58 ` Jonathan Cameron
2022-11-22 20:16   ` Uwe Kleine-König
2022-11-26 15:43     ` Andy Shevchenko
2022-11-23 12:11 ` (subset) " Mark Brown
2022-11-23 17:23 ` Mark Brown
2022-11-24 12:27 ` Mark Brown
2022-11-24 13:26 ` Mark Brown
2022-11-24 13:50 ` Mark Brown
2022-11-24 14:03 ` Mark Brown
2022-11-24 14:28 ` Mark Brown
2022-11-24 15:15 ` Mark Brown
2022-11-24 15:26 ` Mark Brown
2022-11-24 15:38 ` Mark Brown
2022-11-24 15:49 ` Mark Brown
2022-11-24 16:04 ` Mark Brown
2022-11-25 14:27 ` Mark Brown
2022-11-30  9:23 ` Michael Ellerman
2022-12-12 16:36 ` Robert Foss

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=20221118224540.619276-291-uwe@kleine-koenig.org \
    --to=uwe@kleine-koenig.org \
    --cc=ang.iglesiasg@gmail.com \
    --cc=benh@kernel.crashing.org \
    --cc=colin@colino.net \
    --cc=grant.likely@linaro.org \
    --cc=kernel@pengutronix.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --cc=wsa@kernel.org \
    /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).