media: atomisp: Switch i2c drivers back to use .probe()

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
commit 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.

Link: https://lore.kernel.org/r/20230524151646.486847-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 77a2bd1fe7495ff602f29bc3e0113a8888cbb698..1829ba419e3e990c823258f72e9328697c6bf5ee 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -705,7 +705,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 cb4c79b483ca1f58ee1f4ecbcab68534a53d5973..9fa390fbc5f31e3c3b28dc266261a9a68d736cef 100644 (file)
--- 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 c4ce4cd445d7755aa4114a53b1437678a61fb275..cf5d9317b11aba54917d8354fcdbf37a9f545fa9 100644 (file)
--- 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 0e5a981dd331c6d7dcc662872f4bf4ef3b362290..1c6643c442ef3607c781c6224101ce0162c522bf 100644 (file)
--- 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 c079368019e87f5d7d5695ad9c2cff47e922042a..cdb3097b325967f3c13aea19dbfe6e4b5c758db9 100644 (file)
--- 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 5d2e6e2e72f06d1a761edcdb421f2bf3bb532999..6a72691ed5b74dc1b4cfd2c20291bb9a28c8b137 100644 (file)
--- 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 da8c3b1d3bcd8a0bdfc88b8ea17ab0f115fe98ca..c94fe8e861a557c5c02f4c720b621b61621ea877 100644 (file)
--- 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);