net: dsa: 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
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>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/lan9303_i2c.c b/drivers/net/dsa/lan9303_i2c.c
index e8844820c3a93a42e7a1235088b293bfef570adc..bbbec322bc4fbbc52ef5e66c5a862fb349000afb 100644 (file)
--- a/drivers/net/dsa/lan9303_i2c.c
+++ b/drivers/net/dsa/lan9303_i2c.c
@@ -105,7 +105,7 @@ static struct i2c_driver lan9303_i2c_driver = {
                .name = "LAN9303_I2C",
                .of_match_table = lan9303_i2c_of_match,
        },
-       .probe_new = lan9303_i2c_probe,
+       .probe = lan9303_i2c_probe,
        .remove = lan9303_i2c_remove,
        .shutdown = lan9303_i2c_shutdown,
        .id_table = lan9303_i2c_id,

diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index 497be833f70734950a0db94d6d4431fbfcf679bc..2710afad4f3aff838c4ea30f6db5d79d69c992b3 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -119,7 +119,7 @@ static struct i2c_driver ksz9477_i2c_driver = {
                .name   = "ksz9477-switch",
                .of_match_table = ksz9477_dt_ids,
        },
-       .probe_new = ksz9477_i2c_probe,
+       .probe = ksz9477_i2c_probe,
        .remove = ksz9477_i2c_remove,
        .shutdown = ksz9477_i2c_shutdown,
        .id_table = ksz9477_i2c_id,

diff --git a/drivers/net/dsa/xrs700x/xrs700x_i2c.c b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
index 14ff6887a225dc1095cd1da19dfd7e5f463b6a24..c1179d7311f7e4f48e897dd338279eed031932ed 100644 (file)
--- a/drivers/net/dsa/xrs700x/xrs700x_i2c.c
+++ b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
@@ -147,7 +147,7 @@ static struct i2c_driver xrs700x_i2c_driver = {
                .name   = "xrs700x-i2c",
                .of_match_table = of_match_ptr(xrs700x_i2c_dt_ids),
        },
-       .probe_new = xrs700x_i2c_probe,
+       .probe = xrs700x_i2c_probe,
        .remove = xrs700x_i2c_remove,
        .shutdown = xrs700x_i2c_shutdown,
        .id_table = xrs700x_i2c_id,