From: Jonathan Cameron <jic23@kernel.org>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Lars-Peter Clausen" <lars@metafoo.de>,
"Michael Hennerich" <Michael.Hennerich@analog.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Parthiban Veerasooran" <parthiban.veerasooran@microchip.com>,
"Christian Gromm" <christian.gromm@microchip.com>,
"Jens Frederich" <jfrederich@gmail.com>,
"Jon Nettleton" <jon.nettleton@gmail.com>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>,
"Wolfram Sang" <wsa@kernel.org>,
"Jean Delvare" <jdelvare@suse.de>,
"Jeremy Kerr" <jk@codeconstruct.com.au>,
"Kalle Valo" <kvalo@kernel.org>,
"Hans Verkuil" <hverkuil-cisco@xs4all.nl>,
"Peter Senna Tschudin" <peter.senna@gmail.com>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
"Crt Mori" <cmo@melexis.com>, "Haowen Bai" <baihaowen@meizu.com>,
"Tom Rix" <trix@redhat.com>,
"Adrien Grassein" <adrien.grassein@gmail.com>,
"Marek Behún" <kabel@kernel.org>, "Peter Rosin" <peda@axentia.se>,
"Menna Mahmoud" <eng.mennamahmoud.mm@gmail.com>,
linux-iio@vger.kernel.org, linux-staging@lists.linux.dev,
kernel@pengutronix.de, linux-media@vger.kernel.org
Subject: Re: [PATCH] staging: Switch i2c drivers back to use .probe()
Date: Tue, 23 May 2023 21:26:33 +0100 [thread overview]
Message-ID: <20230523212633.7e86f2ea@jic23-huawei> (raw)
In-Reply-To: <20230523200036.465180-1-u.kleine-koenig@pengutronix.de>
On Tue, 23 May 2023 22:00:36 +0200
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
> call-back type"), all drivers being converted to .probe_new() and then
> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert
> back to (the new) .probe() to be able to eventually drop .probe_new() from
> struct i2c_driver.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
If you end up doing a v2 for some reason then please split off the
IIO ones. I tend to pick those up directly then send them in the main
IIO pull requests to Greg.
However, I don't think we have anything else touching those drivers so
fine for Greg to pick up directly
As such,
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
for the IIO ones.
> ---
> Hello,
>
> this patch was generated using coccinelle.
>
> I chose to convert all drivers below drivers/staging in a single
> patch, but if you prefer I can split by driver.
>
> If conflicts arise until this is applied, feel free to just drop the
> files with conflicts from this patch. I'll care about the fallout later
> then.
>
> Also note there is no coordination necessary with the i2c tree. Dropping
> .probe_new() will happen only when all (or most) drivers are converted,
> which will happen after v6.5-rc1 for sure.
>
> Best regards
> Uwe
> drivers/staging/iio/addac/adt7316-i2c.c | 2 +-
> drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 2 +-
> drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +-
> drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +-
> drivers/staging/media/max96712/max96712.c | 2 +-
> drivers/staging/most/i2c/i2c.c | 2 +-
> drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
> 12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
> index 7e3d1a6f30ba..6c1f91c859ca 100644
> --- a/drivers/staging/iio/addac/adt7316-i2c.c
> +++ b/drivers/staging/iio/addac/adt7316-i2c.c
> @@ -138,7 +138,7 @@ static struct i2c_driver adt7316_driver = {
> .of_match_table = adt7316_of_match,
> .pm = ADT7316_PM_OPS,
> },
> - .probe_new = adt7316_i2c_probe,
> + .probe = adt7316_i2c_probe,
> .id_table = adt7316_i2c_id,
> };
> module_i2c_driver(adt7316_driver);
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index b3152f7153fb..46db6d91542a 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -781,7 +781,7 @@ static struct i2c_driver ad5933_driver = {
> .name = "ad5933",
> .of_match_table = ad5933_of_match,
> },
> - .probe_new = ad5933_probe,
> + .probe = ad5933_probe,
> .id_table = ad5933_id,
> };
> module_i2c_driver(ad5933_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> index 273155308fe3..21eb4234a081 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
> @@ -483,7 +483,7 @@ static struct i2c_driver gc0310_driver = {
> .pm = pm_sleep_ptr(&gc0310_pm_ops),
> .acpi_match_table = gc0310_acpi_match,
> },
> - .probe_new = gc0310_probe,
> + .probe = gc0310_probe,
> .remove = gc0310_remove,
> };
> module_i2c_driver(gc0310_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> index cb4c79b483ca..9fa390fbc5f3 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
> @@ -864,7 +864,7 @@ static struct i2c_driver gc2235_driver = {
> .name = "gc2235",
> .acpi_match_table = gc2235_acpi_match,
> },
> - .probe_new = gc2235_probe,
> + .probe = gc2235_probe,
> .remove = gc2235_remove,
> };
> module_i2c_driver(gc2235_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> index c4ce4cd445d7..cf5d9317b11a 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
> @@ -945,7 +945,7 @@ static struct i2c_driver lm3554_driver = {
> .pm = &lm3554_pm_ops,
> .acpi_match_table = lm3554_acpi_match,
> },
> - .probe_new = lm3554_probe,
> + .probe = lm3554_probe,
> .remove = lm3554_remove,
> };
> module_i2c_driver(lm3554_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> index 0e5a981dd331..1c6643c442ef 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
> @@ -1600,7 +1600,7 @@ static struct i2c_driver mt9m114_driver = {
> .name = "mt9m114",
> .acpi_match_table = mt9m114_acpi_match,
> },
> - .probe_new = mt9m114_probe,
> + .probe = mt9m114_probe,
> .remove = mt9m114_remove,
> };
> module_i2c_driver(mt9m114_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> index 63de214916f5..b5d93a96d588 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
> @@ -719,7 +719,7 @@ static struct i2c_driver ov2680_driver = {
> .pm = pm_sleep_ptr(&ov2680_pm_ops),
> .acpi_match_table = ov2680_acpi_match,
> },
> - .probe_new = ov2680_probe,
> + .probe = ov2680_probe,
> .remove = ov2680_remove,
> };
> module_i2c_driver(ov2680_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> index 5d2e6e2e72f0..6a72691ed5b7 100644
> --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
> @@ -1019,7 +1019,7 @@ static struct i2c_driver ov2722_driver = {
> .name = "ov2722",
> .acpi_match_table = ov2722_acpi_match,
> },
> - .probe_new = ov2722_probe,
> + .probe = ov2722_probe,
> .remove = ov2722_remove,
> };
> module_i2c_driver(ov2722_driver);
> diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> index da8c3b1d3bcd..c94fe8e861a5 100644
> --- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> +++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
> @@ -1794,7 +1794,7 @@ static struct i2c_driver ov5693_driver = {
> .name = "ov5693",
> .acpi_match_table = ov5693_acpi_match,
> },
> - .probe_new = ov5693_probe,
> + .probe = ov5693_probe,
> .remove = ov5693_remove,
> };
> module_i2c_driver(ov5693_driver);
> diff --git a/drivers/staging/media/max96712/max96712.c b/drivers/staging/media/max96712/max96712.c
> index 99b333b68198..77943bdf3fb9 100644
> --- a/drivers/staging/media/max96712/max96712.c
> +++ b/drivers/staging/media/max96712/max96712.c
> @@ -427,7 +427,7 @@ static struct i2c_driver max96712_i2c_driver = {
> .name = "max96712",
> .of_match_table = of_match_ptr(max96712_of_table),
> },
> - .probe_new = max96712_probe,
> + .probe = max96712_probe,
> .remove = max96712_remove,
> };
>
> diff --git a/drivers/staging/most/i2c/i2c.c b/drivers/staging/most/i2c/i2c.c
> index 4e85e681922f..ce869280a056 100644
> --- a/drivers/staging/most/i2c/i2c.c
> +++ b/drivers/staging/most/i2c/i2c.c
> @@ -362,7 +362,7 @@ static struct i2c_driver i2c_driver = {
> .driver = {
> .name = "hdm_i2c",
> },
> - .probe_new = i2c_probe,
> + .probe = i2c_probe,
> .remove = i2c_remove,
> .id_table = i2c_id,
> };
> diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
> index 2fba52e0bd7b..d5271eac14f6 100644
> --- a/drivers/staging/olpc_dcon/olpc_dcon.c
> +++ b/drivers/staging/olpc_dcon/olpc_dcon.c
> @@ -779,7 +779,7 @@ static struct i2c_driver dcon_driver = {
> },
> .class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
> .id_table = dcon_idtable,
> - .probe_new = dcon_probe,
> + .probe = dcon_probe,
> .remove = dcon_remove,
> .detect = dcon_detect,
> .address_list = normal_i2c,
>
> base-commit: 1f3413dc8eb0de023c5ec5994aef8225262d0f19
next prev parent reply other threads:[~2023-05-23 20:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 20:00 [PATCH] staging: Switch i2c drivers back to use .probe() Uwe Kleine-König
2023-05-23 20:26 ` Jonathan Cameron [this message]
2023-05-23 20:40 ` Hans de Goede
2023-05-24 6:01 ` Uwe Kleine-König
2023-05-24 8:44 ` Hans de Goede
2023-05-24 10:25 ` Jean Delvare
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=20230523212633.7e86f2ea@jic23-huawei \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=adrien.grassein@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=baihaowen@meizu.com \
--cc=christian.gromm@microchip.com \
--cc=cmo@melexis.com \
--cc=eng.mennamahmoud.mm@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jdelvare@suse.de \
--cc=jfrederich@gmail.com \
--cc=jk@codeconstruct.com.au \
--cc=jon.nettleton@gmail.com \
--cc=kabel@kernel.org \
--cc=kernel@pengutronix.de \
--cc=kvalo@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=parthiban.veerasooran@microchip.com \
--cc=peda@axentia.se \
--cc=peter.senna@gmail.com \
--cc=rostedt@goodmis.org \
--cc=sakari.ailus@linux.intel.com \
--cc=trix@redhat.com \
--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