Merge tag 'br-v6.2g' of git://linuxtv.org/hverkuil/media_tree into media_stage

Despite being big, the changes here are trivial: they just change the
probing method for I2C. So, apply it as a merge.

Tag branch

* tag 'br-v6.2g' of git://linuxtv.org/hverkuil/media_tree: (96 commits)
  media: v4l2-core/tuner-core: Convert to i2c's .probe_new()
  media: usb: go7007: s2250-board: Convert to i2c's .probe_new()
  media: tuners/tua9001: Convert to i2c's .probe_new()
  media: tuners/tda18250: Convert to i2c's .probe_new()
  media: tuners/tda18212: Convert to i2c's .probe_new()
  media: tuners/qm1d1c0042: Convert to i2c's .probe_new()
  media: tuners/qm1d1b0004: Convert to i2c's .probe_new()
  media: tuners/mxl301rf: Convert to i2c's .probe_new()
  media: tuners/mt2060: Convert to i2c's .probe_new()
  media: tuners/m88rs6000t: Convert to i2c's .probe_new()
  media: tuners/fc2580: Convert to i2c's .probe_new()
  media: tuners/e4000: Convert to i2c's .probe_new()
  media: vidtv: Convert to i2c's .probe_new()
  media: radio/tef6862: Convert to i2c's .probe_new()
  media: radio/saa7706h: Convert to i2c's .probe_new()
  media: radio/radio-tea5764: Convert to i2c's .probe_new()
  media: i2c/wm8775: Convert to i2c's .probe_new()
  media: i2c/wm8739: Convert to i2c's .probe_new()
  media: i2c/vs6624: Convert to i2c's .probe_new()
  media: i2c/vpx3220: Convert to i2c's .probe_new()
  ...

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/dvb-frontends/a8293.c b/drivers/media/dvb-frontends/a8293.c
index ba38783b2b4fa6ec683edf60a5f4e306dd7d983a..3d9f87359c717ba4acb2a7e0b1d5a0850b4af7a9 100644 (file)
--- a/drivers/media/dvb-frontends/a8293.c
+++ b/drivers/media/dvb-frontends/a8293.c
@@ -62,8 +62,7 @@ err:
        return ret;
 }
 
-static int a8293_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int a8293_probe(struct i2c_client *client)
 {
        struct a8293_dev *dev;
        struct a8293_platform_data *pdata = client->dev.platform_data;
@@ -118,7 +117,7 @@ static struct i2c_driver a8293_driver = {
                .name   = "a8293",
                .suppress_bind_attrs = true,
        },
-       .probe          = a8293_probe,
+       .probe_new      = a8293_probe,
        .remove         = a8293_remove,
        .id_table       = a8293_id_table,
 };

diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index d85929582c3f934bca010e43231a250b7e17d808..206758a73ae2870c3b196fdfec7f048796ff8593 100644 (file)
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -1430,8 +1430,7 @@ err:
        return ret;
 }
 
-static int af9013_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int af9013_probe(struct i2c_client *client)
 {
        struct af9013_state *state;
        struct af9013_platform_data *pdata = client->dev.platform_data;
@@ -1564,7 +1563,7 @@ static struct i2c_driver af9013_driver = {
                .name   = "af9013",
                .suppress_bind_attrs = true,
        },
-       .probe          = af9013_probe,
+       .probe_new      = af9013_probe,
        .remove         = af9013_remove,
        .id_table       = af9013_id_table,
 };

diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 808da7a9ffe761fc6b867223aee958912ec9ce68..a30773f62006b4f2fe0379d877f405888ee1de54 100644 (file)
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -1049,8 +1049,7 @@ static const struct dvb_frontend_ops af9033_ops = {
        .i2c_gate_ctrl = af9033_i2c_gate_ctrl,
 };
 
-static int af9033_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int af9033_probe(struct i2c_client *client)
 {
        struct af9033_config *cfg = client->dev.platform_data;
        struct af9033_dev *dev;
@@ -1184,7 +1183,7 @@ static struct i2c_driver af9033_driver = {
                .name   = "af9033",
                .suppress_bind_attrs    = true,
        },
-       .probe          = af9033_probe,
+       .probe_new      = af9033_probe,
        .remove         = af9033_remove,
        .id_table       = af9033_id_table,
 };

diff --git a/drivers/media/dvb-frontends/au8522_decoder.c b/drivers/media/dvb-frontends/au8522_decoder.c
index e4f99bd468cb04f230ac4f350023306edda48973..0f748cf46089f1dd8ce345120afcfe3ba2075c1d 100644 (file)
--- a/drivers/media/dvb-frontends/au8522_decoder.c
+++ b/drivers/media/dvb-frontends/au8522_decoder.c
@@ -669,8 +669,7 @@ static const struct v4l2_ctrl_ops au8522_ctrl_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int au8522_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int au8522_probe(struct i2c_client *client)
 {
        struct au8522_state *state;
        struct v4l2_ctrl_handler *hdl;
@@ -777,7 +776,7 @@ static struct i2c_driver au8522_driver = {
        .driver = {
                .name   = "au8522",
        },
-       .probe          = au8522_probe,
+       .probe_new      = au8522_probe,
        .remove         = au8522_remove,
        .id_table       = au8522_id,
 };

diff --git a/drivers/media/dvb-frontends/cxd2099.c b/drivers/media/dvb-frontends/cxd2099.c
index fbc666fa04ec5c6896d85cbcd9765cfe1d3fe4ad..c0967ad95220869f4ce204bc888f78d1781c71c0 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2099.c
+++ b/drivers/media/dvb-frontends/cxd2099.c
@@ -598,8 +598,7 @@ static const struct dvb_ca_en50221 en_templ = {
        .write_data          = write_data,
 };
 
-static int cxd2099_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int cxd2099_probe(struct i2c_client *client)
 {
        struct cxd *ci;
        struct cxd2099_cfg *cfg = client->dev.platform_data;
@@ -682,7 +681,7 @@ static struct i2c_driver cxd2099_driver = {
        .driver = {
                .name   = "cxd2099",
        },
-       .probe          = cxd2099_probe,
+       .probe_new      = cxd2099_probe,
        .remove         = cxd2099_remove,
        .id_table       = cxd2099_id,
 };

diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 5d98222f9df0919a01e52d2d1bea008626f6ff56..b8d5cb3a269d7558871a50cac2ab9a65084dbb0a 100644 (file)
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -547,8 +547,7 @@ static struct dvb_frontend *cxd2820r_get_dvb_frontend(struct i2c_client *client)
        return &priv->fe;
 }
 
-static int cxd2820r_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int cxd2820r_probe(struct i2c_client *client)
 {
        struct cxd2820r_platform_data *pdata = client->dev.platform_data;
        struct cxd2820r_priv *priv;
@@ -734,7 +733,7 @@ static struct i2c_driver cxd2820r_driver = {
                .name                = "cxd2820r",
                .suppress_bind_attrs = true,
        },
-       .probe    = cxd2820r_probe,
+       .probe_new = cxd2820r_probe,
        .remove   = cxd2820r_remove,
        .id_table = cxd2820r_id_table,
 };

diff --git a/drivers/media/dvb-frontends/helene.c b/drivers/media/dvb-frontends/helene.c
index 8c1310c6b0bc239702fee9f58f057027c98ba927..e4bbf6a51a2bc792e253a775b492f3af12c291ab 100644 (file)
--- a/drivers/media/dvb-frontends/helene.c
+++ b/drivers/media/dvb-frontends/helene.c
@@ -1063,8 +1063,7 @@ struct dvb_frontend *helene_attach(struct dvb_frontend *fe,
 }
 EXPORT_SYMBOL(helene_attach);
 
-static int helene_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int helene_probe(struct i2c_client *client)
 {
        struct helene_config *config = client->dev.platform_data;
        struct dvb_frontend *fe = config->fe;
@@ -1111,7 +1110,7 @@ static struct i2c_driver helene_driver = {
        .driver = {
                .name = "helene",
        },
-       .probe    = helene_probe,
+       .probe_new = helene_probe,
        .id_table = helene_id,
 };
 module_i2c_driver(helene_driver);

diff --git a/drivers/media/dvb-frontends/lgdt3306a.c b/drivers/media/dvb-frontends/lgdt3306a.c
index 424311afb2bfa24f55ad99d45fd14f52cacdf9ef..6bf723b5ffad80426ca80c88fa9111221faab375 100644 (file)
--- a/drivers/media/dvb-frontends/lgdt3306a.c
+++ b/drivers/media/dvb-frontends/lgdt3306a.c
@@ -2169,8 +2169,7 @@ static int lgdt3306a_deselect(struct i2c_mux_core *muxc, u32 chan)
        return lgdt3306a_i2c_gate_ctrl(&state->frontend, 0);
 }
 
-static int lgdt3306a_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int lgdt3306a_probe(struct i2c_client *client)
 {
        struct lgdt3306a_config *config;
        struct lgdt3306a_state *state;
@@ -2250,7 +2249,7 @@ static struct i2c_driver lgdt3306a_driver = {
                .name                = "lgdt3306a",
                .suppress_bind_attrs = true,
        },
-       .probe          = lgdt3306a_probe,
+       .probe_new      = lgdt3306a_probe,
        .remove         = lgdt3306a_remove,
        .id_table       = lgdt3306a_id_table,
 };

diff --git a/drivers/media/dvb-frontends/lgdt330x.c b/drivers/media/dvb-frontends/lgdt330x.c
index ea9ae22fd201646c5df55dfd9241a72a16dfbd16..1d6932d8e49786ea97fc6672a9a782077cb3bb38 100644 (file)
--- a/drivers/media/dvb-frontends/lgdt330x.c
+++ b/drivers/media/dvb-frontends/lgdt330x.c
@@ -857,8 +857,7 @@ static struct dvb_frontend *lgdt330x_get_dvb_frontend(struct i2c_client *client)
 static const struct dvb_frontend_ops lgdt3302_ops;
 static const struct dvb_frontend_ops lgdt3303_ops;
 
-static int lgdt330x_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int lgdt330x_probe(struct i2c_client *client)
 {
        struct lgdt330x_state *state = NULL;
        u8 buf[1];
@@ -994,7 +993,7 @@ static struct i2c_driver lgdt330x_driver = {
                .name   = "lgdt330x",
                .suppress_bind_attrs = true,
        },
-       .probe          = lgdt330x_probe,
+       .probe_new      = lgdt330x_probe,
        .remove         = lgdt330x_remove,
        .id_table       = lgdt330x_id_table,
 };

diff --git a/drivers/media/dvb-frontends/mn88472.c b/drivers/media/dvb-frontends/mn88472.c
index 2b01cc678f7efed4916460b5bf62f67cd803ce68..4a71f1c6371aa9a1a9cfb46105c12d6fbbe9296f 100644 (file)
--- a/drivers/media/dvb-frontends/mn88472.c
+++ b/drivers/media/dvb-frontends/mn88472.c
@@ -572,8 +572,7 @@ static struct dvb_frontend *mn88472_get_dvb_frontend(struct i2c_client *client)
        return &dev->fe;
 }
 
-static int mn88472_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mn88472_probe(struct i2c_client *client)
 {
        struct mn88472_config *pdata = client->dev.platform_data;
        struct mn88472_dev *dev;
@@ -719,7 +718,7 @@ static struct i2c_driver mn88472_driver = {
                .name = "mn88472",
                .suppress_bind_attrs = true,
        },
-       .probe    = mn88472_probe,
+       .probe_new = mn88472_probe,
        .remove   = mn88472_remove,
        .id_table = mn88472_id_table,
 };

diff --git a/drivers/media/dvb-frontends/mn88473.c b/drivers/media/dvb-frontends/mn88473.c
index f0ecf5910c022a1cd22e02ce1300f3f15bc6d83a..205b14ae584e90b07ac3bd18a415698a05e49765 100644 (file)
--- a/drivers/media/dvb-frontends/mn88473.c
+++ b/drivers/media/dvb-frontends/mn88473.c
@@ -606,8 +606,7 @@ static const struct dvb_frontend_ops mn88473_ops = {
        .read_status = mn88473_read_status,
 };
 
-static int mn88473_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int mn88473_probe(struct i2c_client *client)
 {
        struct mn88473_config *config = client->dev.platform_data;
        struct mn88473_dev *dev;
@@ -754,7 +753,7 @@ static struct i2c_driver mn88473_driver = {
                .name                = "mn88473",
                .suppress_bind_attrs = true,
        },
-       .probe          = mn88473_probe,
+       .probe_new      = mn88473_probe,
        .remove         = mn88473_remove,
        .id_table       = mn88473_id_table,
 };

diff --git a/drivers/media/dvb-frontends/mxl692.c b/drivers/media/dvb-frontends/mxl692.c
index 129630cbffffe24601d5cd2d837ddbea383a0b5d..9858e11943a0839f1a5aec011cffc9fd633c9bdf 100644 (file)
--- a/drivers/media/dvb-frontends/mxl692.c
+++ b/drivers/media/dvb-frontends/mxl692.c
@@ -1308,8 +1308,7 @@ static const struct dvb_frontend_ops mxl692_ops = {
        .read_snr             = mxl692_read_snr,
 };
 
-static int mxl692_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int mxl692_probe(struct i2c_client *client)
 {
        struct mxl692_config *config = client->dev.platform_data;
        struct mxl692_dev *dev;
@@ -1356,7 +1355,7 @@ static struct i2c_driver mxl692_driver = {
        .driver = {
                .name   = "mxl692",
        },
-       .probe          = mxl692_probe,
+       .probe_new      = mxl692_probe,
        .remove         = mxl692_remove,
        .id_table       = mxl692_id_table,
 };

diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index e0fbf41316ae7ca1df4c0deede5a60e894ac5907..db3254950147c478ba1b3bfd2f0a121850fdbe6d 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -768,8 +768,7 @@ static int rtl2830_regmap_gather_write(void *context, const void *reg,
        return 0;
 }
 
-static int rtl2830_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int rtl2830_probe(struct i2c_client *client)
 {
        struct rtl2830_platform_data *pdata = client->dev.platform_data;
        struct rtl2830_dev *dev;
@@ -887,7 +886,7 @@ static struct i2c_driver rtl2830_driver = {
                .name                   = "rtl2830",
                .suppress_bind_attrs    = true,
        },
-       .probe          = rtl2830_probe,
+       .probe_new      = rtl2830_probe,
        .remove         = rtl2830_remove,
        .id_table       = rtl2830_id_table,
 };

diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index 4fa884eda5d505de195b78bf75c9f0712495d198..900d4db8b9221f498bfa5a3fc991c4fd133384ad 100644 (file)
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -1021,8 +1021,7 @@ err:
        return ret;
 }
 
-static int rtl2832_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int rtl2832_probe(struct i2c_client *client)
 {
        struct rtl2832_platform_data *pdata = client->dev.platform_data;
        struct i2c_adapter *i2c = client->adapter;
@@ -1136,7 +1135,7 @@ static struct i2c_driver rtl2832_driver = {
                .name   = "rtl2832",
                .suppress_bind_attrs    = true,
        },
-       .probe          = rtl2832_probe,
+       .probe_new      = rtl2832_probe,
        .remove         = rtl2832_remove,
        .id_table       = rtl2832_id_table,
 };

diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 86b0d59169ddf743b7f00bbdcba2e8717fb6429c..cc07e965c34c51f7e37a78c5500cd8a82fe3f886 100644 (file)
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -1144,8 +1144,7 @@ static const struct dvb_frontend_ops si2165_ops = {
        .read_ber          = si2165_read_ber,
 };
 
-static int si2165_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int si2165_probe(struct i2c_client *client)
 {
        struct si2165_state *state = NULL;
        struct si2165_platform_data *pdata = client->dev.platform_data;
@@ -1293,7 +1292,7 @@ static struct i2c_driver si2165_driver = {
        .driver = {
                .name   = "si2165",
        },
-       .probe          = si2165_probe,
+       .probe_new      = si2165_probe,
        .remove         = si2165_remove,
        .id_table       = si2165_id_table,
 };

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 8157df4570d195a375776c46fad877fe3f481dbf..2a0e108c5eb0c19604621575f49628dbbb64e106 100644 (file)
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -672,8 +672,7 @@ static const struct dvb_frontend_ops si2168_ops = {
        .read_status = si2168_read_status,
 };
 
-static int si2168_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int si2168_probe(struct i2c_client *client)
 {
        struct si2168_config *config = client->dev.platform_data;
        struct si2168_dev *dev;
@@ -799,7 +798,7 @@ static struct i2c_driver si2168_driver = {
                .name                = "si2168",
                .suppress_bind_attrs = true,
        },
-       .probe          = si2168_probe,
+       .probe_new      = si2168_probe,
        .remove         = si2168_remove,
        .id_table       = si2168_id_table,
 };

diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 27e7037e130ead1d75b944e07dc006f993d31da6..3395f6b5b948edae77a225997a856ff3a8781a3a 100644 (file)
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -363,8 +363,7 @@ static int sp2_exit(struct i2c_client *client)
        return 0;
 }
 
-static int sp2_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int sp2_probe(struct i2c_client *client)
 {
        struct sp2_config *cfg = client->dev.platform_data;
        struct sp2 *s;
@@ -417,7 +416,7 @@ static struct i2c_driver sp2_driver = {
        .driver = {
                .name   = "sp2",
        },
-       .probe          = sp2_probe,
+       .probe_new      = sp2_probe,
        .remove         = sp2_remove,
        .id_table       = sp2_id,
 };

diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 0a600c1d7d1b1fd0fed55f8595be6705f445f2a1..9bde0ad6f26eb36128e555349d925465384e0e7f 100644 (file)
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -4990,8 +4990,7 @@ static struct dvb_frontend *stv090x_get_dvb_frontend(struct i2c_client *client)
        return &state->frontend;
 }
 
-static int stv090x_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int stv090x_probe(struct i2c_client *client)
 {
        int ret = 0;
        struct stv090x_config *config = client->dev.platform_data;
@@ -5085,7 +5084,7 @@ static struct i2c_driver stv090x_driver = {
                .name   = "stv090x",
                .suppress_bind_attrs = true,
        },
-       .probe          = stv090x_probe,
+       .probe_new      = stv090x_probe,
        .remove         = stv090x_remove,
        .id_table       = stv090x_id_table,
 };

diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index fbc4dbd62151d0c135fd1418cfdeabaa472d7feb..b2f456116c60fc61d02c6e7319557b5009b17740 100644 (file)
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -406,8 +406,7 @@ static struct stv6110x_devctl *stv6110x_get_devctl(struct i2c_client *client)
        return stv6110x->devctl;
 }
 
-static int stv6110x_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int stv6110x_probe(struct i2c_client *client)
 {
        struct stv6110x_config *config = client->dev.platform_data;
 
@@ -481,7 +480,7 @@ static struct i2c_driver stv6110x_driver = {
                .name   = "stv6110x",
                .suppress_bind_attrs = true,
        },
-       .probe          = stv6110x_probe,
+       .probe_new      = stv6110x_probe,
        .remove         = stv6110x_remove,
        .id_table       = stv6110x_id_table,
 };

diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index d1098ef20a8bdcf6b691e66054b76303687d2a8c..c8e5617d08c0b02a746f1c8a7e8564ac98fd9094 100644 (file)
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -1145,8 +1145,7 @@ static struct dvb_frontend *tda10071_get_dvb_frontend(struct i2c_client *client)
        return &dev->fe;
 }
 
-static int tda10071_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tda10071_probe(struct i2c_client *client)
 {
        struct tda10071_dev *dev;
        struct tda10071_platform_data *pdata = client->dev.platform_data;
@@ -1241,7 +1240,7 @@ static struct i2c_driver tda10071_driver = {
                .name   = "tda10071",
                .suppress_bind_attrs = true,
        },
-       .probe          = tda10071_probe,
+       .probe_new      = tda10071_probe,
        .remove         = tda10071_remove,
        .id_table       = tda10071_id_table,
 };

diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index 02338256b974f79d9f90a728e28d51d92a5ca2f5..c28fee7509cddfc010682a18a2c80bbe6b00572d 100644 (file)
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -550,8 +550,7 @@ static void ts2020_regmap_unlock(void *__dev)
        mutex_unlock(&dev->regmap_mutex);
 }
 
-static int ts2020_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int ts2020_probe(struct i2c_client *client)
 {
        struct ts2020_config *pdata = client->dev.platform_data;
        struct dvb_frontend *fe = pdata->fe;
@@ -721,7 +720,7 @@ static struct i2c_driver ts2020_driver = {
        .driver = {
                .name   = "ts2020",
        },
-       .probe          = ts2020_probe,
+       .probe_new      = ts2020_probe,
        .remove         = ts2020_remove,
        .id_table       = ts2020_id_table,
 };

diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
index a12fedcc3a1ced82d965511d34e93ea2445c876b..9945d17fadd60b9091d4ac1581fb7401af930e98 100644 (file)
--- a/drivers/media/i2c/ad5820.c
+++ b/drivers/media/i2c/ad5820.c
@@ -290,8 +290,7 @@ static int __maybe_unused ad5820_resume(struct device *dev)
        return ad5820_power_on(coil, true);
 }
 
-static int ad5820_probe(struct i2c_client *client,
-                       const struct i2c_device_id *devid)
+static int ad5820_probe(struct i2c_client *client)
 {
        struct ad5820_device *coil;
        int ret;
@@ -377,7 +376,7 @@ static struct i2c_driver ad5820_i2c_driver = {
                .pm     = &ad5820_pm,
                .of_match_table = ad5820_of_table,
        },
-       .probe          = ad5820_probe,
+       .probe_new      = ad5820_probe,
        .remove         = ad5820_remove,
        .id_table       = ad5820_id_table,
 };

diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c
index 4a255a492918bf8a8ad2c3a5755cf0152bd2a856..ad17097a2d251de20bbef679058112133b681dec 100644 (file)
--- a/drivers/media/i2c/ad9389b.c
+++ b/drivers/media/i2c/ad9389b.c
@@ -1080,7 +1080,7 @@ static void ad9389b_init_setup(struct v4l2_subdev *sd)
        ad9389b_set_isr(sd, false);
 }
 
-static int ad9389b_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ad9389b_probe(struct i2c_client *client)
 {
        const struct v4l2_dv_timings dv1080p60 = V4L2_DV_BT_CEA_1920X1080P60;
        struct ad9389b_state *state;
@@ -1207,7 +1207,7 @@ static struct i2c_driver ad9389b_driver = {
        .driver = {
                .name = "ad9389b",
        },
-       .probe = ad9389b_probe,
+       .probe_new = ad9389b_probe,
        .remove = ad9389b_remove,
        .id_table = ad9389b_id,
 };

diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c
index 1f353157df07683c19e5af3fafaec8b79be57aae..a61a77de6eee3708a9f402ad0bc4caade352a840 100644 (file)
--- a/drivers/media/i2c/adp1653.c
+++ b/drivers/media/i2c/adp1653.c
@@ -463,8 +463,7 @@ err:
 }
 
 
-static int adp1653_probe(struct i2c_client *client,
-                        const struct i2c_device_id *devid)
+static int adp1653_probe(struct i2c_client *client)
 {
        struct adp1653_flash *flash;
        int ret;
@@ -536,7 +535,7 @@ static struct i2c_driver adp1653_i2c_driver = {
                .name   = ADP1653_NAME,
                .pm     = &adp1653_pm_ops,
        },
-       .probe          = adp1653_probe,
+       .probe_new      = adp1653_probe,
        .remove         = adp1653_remove,
        .id_table       = adp1653_id_table,
 };

diff --git a/drivers/media/i2c/adv7170.c b/drivers/media/i2c/adv7170.c
index 61a2f87d3c62cb25e04188f82c670c4169413067..aa0f80e299b32c86b2339b41674678d18db40e29 100644 (file)
--- a/drivers/media/i2c/adv7170.c
+++ b/drivers/media/i2c/adv7170.c
@@ -334,8 +334,7 @@ static const struct v4l2_subdev_ops adv7170_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int adv7170_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int adv7170_probe(struct i2c_client *client)
 {
        struct adv7170 *encoder;
        struct v4l2_subdev *sd;
@@ -388,7 +387,7 @@ static struct i2c_driver adv7170_driver = {
        .driver = {
                .name   = "adv7170",
        },
-       .probe          = adv7170_probe,
+       .probe_new      = adv7170_probe,
        .remove         = adv7170_remove,
        .id_table       = adv7170_id,
 };

diff --git a/drivers/media/i2c/adv7175.c b/drivers/media/i2c/adv7175.c
index b58689728243fc189f57eb900ec64dd5171f83be..d9bea2b9ec3343bdffe4b750cb3c642e8103c191 100644 (file)
--- a/drivers/media/i2c/adv7175.c
+++ b/drivers/media/i2c/adv7175.c
@@ -389,8 +389,7 @@ static const struct v4l2_subdev_ops adv7175_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int adv7175_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int adv7175_probe(struct i2c_client *client)
 {
        int i;
        struct adv7175 *encoder;
@@ -443,7 +442,7 @@ static struct i2c_driver adv7175_driver = {
        .driver = {
                .name   = "adv7175",
        },
-       .probe          = adv7175_probe,
+       .probe_new      = adv7175_probe,
        .remove         = adv7175_remove,
        .id_table       = adv7175_id,
 };

diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index 313c706e83354823c4c3c95017c2b7ebae278838..98b63d79d33d45fa49ccfc072aef3157223134a3 100644 (file)
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -521,8 +521,7 @@ static const struct v4l2_subdev_ops adv7183_ops = {
        .pad = &adv7183_pad_ops,
 };
 
-static int adv7183_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int adv7183_probe(struct i2c_client *client)
 {
        struct adv7183 *decoder;
        struct v4l2_subdev *sd;
@@ -632,7 +631,7 @@ static struct i2c_driver adv7183_driver = {
        .driver = {
                .name   = "adv7183",
        },
-       .probe          = adv7183_probe,
+       .probe_new      = adv7183_probe,
        .remove         = adv7183_remove,
        .id_table       = adv7183_id,
 };

diff --git a/drivers/media/i2c/adv7393.c b/drivers/media/i2c/adv7393.c
index fb5fefa83b18631f9667f8e2507bb1e4a9d16ed6..61e916cbe65180a41f4f01353dddd33658aa3c40 100644 (file)
--- a/drivers/media/i2c/adv7393.c
+++ b/drivers/media/i2c/adv7393.c
@@ -381,8 +381,7 @@ static int adv7393_initialize(struct v4l2_subdev *sd)
        return err;
 }
 
-static int adv7393_probe(struct i2c_client *client,
-                               const struct i2c_device_id *id)
+static int adv7393_probe(struct i2c_client *client)
 {
        struct adv7393_state *state;
        int err;
@@ -456,7 +455,7 @@ static struct i2c_driver adv7393_driver = {
        .driver = {
                .name   = "adv7393",
        },
-       .probe          = adv7393_probe,
+       .probe_new      = adv7393_probe,
        .remove         = adv7393_remove,
        .id_table       = adv7393_id,
 };

diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index 0d5ce69f12e7386d6d4d693dda83215f2f8d65fa..3999fa524cab73d236c6b7557e5af65236eb2b90 100644 (file)
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -1763,7 +1763,7 @@ static void adv7511_init_setup(struct v4l2_subdev *sd)
        adv7511_cec_write(sd, 0x4e, ratio << 2);
 }
 
-static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int adv7511_probe(struct i2c_client *client)
 {
        struct adv7511_state *state;
        struct adv7511_platform_data *pdata = client->dev.platform_data;
@@ -1957,7 +1957,7 @@ static struct i2c_driver adv7511_driver = {
        .driver = {
                .name = "adv7511-v4l2",
        },
-       .probe = adv7511_probe,
+       .probe_new = adv7511_probe,
        .remove = adv7511_remove,
        .id_table = adv7511_id,
 };

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 7731cc1887e671e243120ca068e6909726d21104..cb86555741190511f1df185e01ce06622e5b25c4 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3441,8 +3441,7 @@ static int adv7842_register_clients(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int adv7842_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int adv7842_probe(struct i2c_client *client)
 {
        struct adv7842_state *state;
        static const struct v4l2_dv_timings cea640x480 =
@@ -3620,7 +3619,7 @@ static struct i2c_driver adv7842_driver = {
        .driver = {
                .name = "adv7842",
        },
-       .probe = adv7842_probe,
+       .probe_new = adv7842_probe,
        .remove = adv7842_remove,
        .id_table = adv7842_id,
 };

diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
index 0370ad6b6811e10484e98404d669b719cc92d2d2..7c9ab76e244808c868373e9120cc1fa121f12db8 100644 (file)
--- a/drivers/media/i2c/ak881x.c
+++ b/drivers/media/i2c/ak881x.c
@@ -226,8 +226,7 @@ static const struct v4l2_subdev_ops ak881x_subdev_ops = {
        .pad    = &ak881x_subdev_pad_ops,
 };
 
-static int ak881x_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int ak881x_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct ak881x *ak881x;
@@ -315,7 +314,7 @@ static struct i2c_driver ak881x_i2c_driver = {
        .driver = {
                .name = "ak881x",
        },
-       .probe          = ak881x_probe,
+       .probe_new      = ak881x_probe,
        .remove         = ak881x_remove,
        .id_table       = ak881x_id,
 };

diff --git a/drivers/media/i2c/bt819.c b/drivers/media/i2c/bt819.c
index 4d9bb6eb7d6527f9751c2e81e7f38da835d1d665..39f8a53611665e3efc0ee4158ed0bce481a723ee 100644 (file)
--- a/drivers/media/i2c/bt819.c
+++ b/drivers/media/i2c/bt819.c
@@ -380,8 +380,7 @@ static const struct v4l2_subdev_ops bt819_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int bt819_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int bt819_probe(struct i2c_client *client)
 {
        int i, ver;
        struct bt819 *decoder;
@@ -469,7 +468,7 @@ static struct i2c_driver bt819_driver = {
        .driver = {
                .name   = "bt819",
        },
-       .probe          = bt819_probe,
+       .probe_new      = bt819_probe,
        .remove         = bt819_remove,
        .id_table       = bt819_id,
 };

diff --git a/drivers/media/i2c/bt856.c b/drivers/media/i2c/bt856.c
index 70443ef1ac46ae66e4977d2b34b3b2760252045b..d1d397b15b85c9c83208b0ae476e1d477b29ba4d 100644 (file)
--- a/drivers/media/i2c/bt856.c
+++ b/drivers/media/i2c/bt856.c
@@ -181,8 +181,7 @@ static const struct v4l2_subdev_ops bt856_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int bt856_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int bt856_probe(struct i2c_client *client)
 {
        struct bt856 *encoder;
        struct v4l2_subdev *sd;
@@ -240,7 +239,7 @@ static struct i2c_driver bt856_driver = {
        .driver = {
                .name   = "bt856",
        },
-       .probe          = bt856_probe,
+       .probe_new      = bt856_probe,
        .remove         = bt856_remove,
        .id_table       = bt856_id,
 };

diff --git a/drivers/media/i2c/bt866.c b/drivers/media/i2c/bt866.c
index c2508cbafd02fbf77f3c9f96adc46cabf26948c5..d632d9a07f0499b46511117dc53eadca3ec938d7 100644 (file)
--- a/drivers/media/i2c/bt866.c
+++ b/drivers/media/i2c/bt866.c
@@ -173,8 +173,7 @@ static const struct v4l2_subdev_ops bt866_ops = {
        .video = &bt866_video_ops,
 };
 
-static int bt866_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int bt866_probe(struct i2c_client *client)
 {
        struct bt866 *encoder;
        struct v4l2_subdev *sd;
@@ -207,7 +206,7 @@ static struct i2c_driver bt866_driver = {
        .driver = {
                .name   = "bt866",
        },
-       .probe          = bt866_probe,
+       .probe_new      = bt866_probe,
        .remove         = bt866_remove,
        .id_table       = bt866_id,
 };

diff --git a/drivers/media/i2c/cs3308.c b/drivers/media/i2c/cs3308.c
index d901a59883a93359cacd16b060b16f4b34cdcfb7..a0b66c04fe252834b57044ae3eb74d100c476820 100644 (file)
--- a/drivers/media/i2c/cs3308.c
+++ b/drivers/media/i2c/cs3308.c
@@ -64,8 +64,7 @@ static const struct v4l2_subdev_ops cs3308_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int cs3308_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int cs3308_probe(struct i2c_client *client)
 {
        struct v4l2_subdev *sd;
        unsigned i;
@@ -119,7 +118,7 @@ static struct i2c_driver cs3308_driver = {
        .driver = {
                .name   = "cs3308",
        },
-       .probe          = cs3308_probe,
+       .probe_new      = cs3308_probe,
        .remove         = cs3308_remove,
        .id_table       = cs3308_id,
 };

diff --git a/drivers/media/i2c/cs5345.c b/drivers/media/i2c/cs5345.c
index 591b1e7b24eeefa7eaf468568041c4568f1d283f..ac4b5632fc46150f3ed2b27c03aac3469864cd94 100644 (file)
--- a/drivers/media/i2c/cs5345.c
+++ b/drivers/media/i2c/cs5345.c
@@ -136,8 +136,7 @@ static const struct v4l2_subdev_ops cs5345_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int cs5345_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int cs5345_probe(struct i2c_client *client)
 {
        struct cs5345_state *state;
        struct v4l2_subdev *sd;
@@ -199,7 +198,7 @@ static struct i2c_driver cs5345_driver = {
        .driver = {
                .name   = "cs5345",
        },
-       .probe          = cs5345_probe,
+       .probe_new      = cs5345_probe,
        .remove         = cs5345_remove,
        .id_table       = cs5345_id,
 };

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index f1a978af82ef288d8171900b719b09165eab13c8..46cf422270b2dbebcd2bb18a57f774bae15136c1 100644 (file)
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -5825,8 +5825,7 @@ static u32 get_cx2388x_ident(struct i2c_client *client)
        return ret;
 }
 
-static int cx25840_probe(struct i2c_client *client,
-                        const struct i2c_device_id *did)
+static int cx25840_probe(struct i2c_client *client)
 {
        struct cx25840_state *state;
        struct v4l2_subdev *sd;
@@ -6046,7 +6045,7 @@ static struct i2c_driver cx25840_driver = {
        .driver = {
                .name   = "cx25840",
        },
-       .probe          = cx25840_probe,
+       .probe_new      = cx25840_probe,
        .remove         = cx25840_remove,
        .id_table       = cx25840_id,
 };

diff --git a/drivers/media/i2c/ks0127.c b/drivers/media/i2c/ks0127.c
index 215d9a43b0b93263a0d97d5a9a3af9202bda3992..0d86f2db7ad207a022b65807a487d82a72796077 100644 (file)
--- a/drivers/media/i2c/ks0127.c
+++ b/drivers/media/i2c/ks0127.c
@@ -650,7 +650,7 @@ static const struct v4l2_subdev_ops ks0127_ops = {
 /* ----------------------------------------------------------------------- */
 
 
-static int ks0127_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int ks0127_probe(struct i2c_client *client)
 {
        struct ks0127 *ks;
        struct v4l2_subdev *sd;
@@ -696,7 +696,7 @@ static struct i2c_driver ks0127_driver = {
        .driver = {
                .name   = "ks0127",
        },
-       .probe          = ks0127_probe,
+       .probe_new      = ks0127_probe,
        .remove         = ks0127_remove,
        .id_table       = ks0127_id,
 };

diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
index edad3138cb075fa249ccadcbd772a0f53ee5e2d4..5ef613604be700c99234bb48b279601504ccfd29 100644 (file)
--- a/drivers/media/i2c/lm3560.c
+++ b/drivers/media/i2c/lm3560.c
@@ -391,8 +391,7 @@ static int lm3560_init_device(struct lm3560_flash *flash)
        return rval;
 }
 
-static int lm3560_probe(struct i2c_client *client,
-                       const struct i2c_device_id *devid)
+static int lm3560_probe(struct i2c_client *client)
 {
        struct lm3560_flash *flash;
        struct lm3560_platform_data *pdata = dev_get_platdata(&client->dev);
@@ -468,7 +467,7 @@ static struct i2c_driver lm3560_i2c_driver = {
                   .name = LM3560_NAME,
                   .pm = NULL,
                   },
-       .probe = lm3560_probe,
+       .probe_new = lm3560_probe,
        .remove = lm3560_remove,
        .id_table = lm3560_id_table,
 };

diff --git a/drivers/media/i2c/lm3646.c b/drivers/media/i2c/lm3646.c
index 0aaa963917d8cd5937d400d7c0ce5d981a38c15d..2a0cf74d2bed6ae68ed7786d33af46b8b8cb7ed6 100644 (file)
--- a/drivers/media/i2c/lm3646.c
+++ b/drivers/media/i2c/lm3646.c
@@ -334,8 +334,7 @@ static int lm3646_init_device(struct lm3646_flash *flash)
        return regmap_read(flash->regmap, REG_FLAG, &reg_val);
 }
 
-static int lm3646_probe(struct i2c_client *client,
-                       const struct i2c_device_id *devid)
+static int lm3646_probe(struct i2c_client *client)
 {
        struct lm3646_flash *flash;
        struct lm3646_platform_data *pdata = dev_get_platdata(&client->dev);
@@ -397,7 +396,7 @@ static struct i2c_driver lm3646_i2c_driver = {
        .driver = {
                   .name = LM3646_NAME,
                   },
-       .probe = lm3646_probe,
+       .probe_new = lm3646_probe,
        .remove = lm3646_remove,
        .id_table = lm3646_id_table,
 };

diff --git a/drivers/media/i2c/m52790.c b/drivers/media/i2c/m52790.c
index 2ab91b993c33f9c32f7ed8d9d098179a6bce0307..0e6507ab7e083b37822dcdaba284703d7b00d5ba 100644 (file)
--- a/drivers/media/i2c/m52790.c
+++ b/drivers/media/i2c/m52790.c
@@ -129,8 +129,7 @@ static const struct v4l2_subdev_ops m52790_ops = {
 
 /* i2c implementation */
 
-static int m52790_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int m52790_probe(struct i2c_client *client)
 {
        struct m52790_state *state;
        struct v4l2_subdev *sd;
@@ -173,7 +172,7 @@ static struct i2c_driver m52790_driver = {
        .driver = {
                .name   = "m52790",
        },
-       .probe          = m52790_probe,
+       .probe_new      = m52790_probe,
        .remove         = m52790_remove,
        .id_table       = m52790_id,
 };

diff --git a/drivers/media/i2c/m5mols/m5mols_core.c b/drivers/media/i2c/m5mols/m5mols_core.c
index 2201d2a26353aa68c9157812fa4a286581c9ef6b..2b01873ba0db51c9c999a2d578591a85c944f0e1 100644 (file)
--- a/drivers/media/i2c/m5mols/m5mols_core.c
+++ b/drivers/media/i2c/m5mols/m5mols_core.c
@@ -939,8 +939,7 @@ static irqreturn_t m5mols_irq_handler(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static int m5mols_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int m5mols_probe(struct i2c_client *client)
 {
        const struct m5mols_platform_data *pdata = client->dev.platform_data;
        struct m5mols_info *info;
@@ -1039,7 +1038,7 @@ static struct i2c_driver m5mols_i2c_driver = {
        .driver = {
                .name   = MODULE_NAME,
        },
-       .probe          = m5mols_probe,
+       .probe_new      = m5mols_probe,
        .remove         = m5mols_remove,
        .id_table       = m5mols_id,
 };

diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
index 49ec59b0ca43669dbc79066d0bb06fb317ae767c..dbd2f0bd3651875cde030bb6c68cffb537f13f24 100644 (file)
--- a/drivers/media/i2c/ml86v7667.c
+++ b/drivers/media/i2c/ml86v7667.c
@@ -359,8 +359,7 @@ static int ml86v7667_init(struct ml86v7667_priv *priv)
        return ret;
 }
 
-static int ml86v7667_probe(struct i2c_client *client,
-                          const struct i2c_device_id *did)
+static int ml86v7667_probe(struct i2c_client *client)
 {
        struct ml86v7667_priv *priv;
        int ret;
@@ -434,7 +433,7 @@ static struct i2c_driver ml86v7667_i2c_driver = {
        .driver = {
                .name   = DRV_NAME,
        },
-       .probe          = ml86v7667_probe,
+       .probe_new      = ml86v7667_probe,
        .remove         = ml86v7667_remove,
        .id_table       = ml86v7667_id,
 };

diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c
index 76b8c9c08c820930490d6b5f05c6b62183c96f25..958cfdd73d57f7afabc0e3b250f8110a5a9c56a6 100644 (file)
--- a/drivers/media/i2c/mt9m032.c
+++ b/drivers/media/i2c/mt9m032.c
@@ -701,8 +701,7 @@ static const struct v4l2_subdev_ops mt9m032_ops = {
  * Driver initialization and probing
  */
 
-static int mt9m032_probe(struct i2c_client *client,
-                        const struct i2c_device_id *devid)
+static int mt9m032_probe(struct i2c_client *client)
 {
        struct mt9m032_platform_data *pdata = client->dev.platform_data;
        struct i2c_adapter *adapter = client->adapter;
@@ -880,7 +879,7 @@ static struct i2c_driver mt9m032_i2c_driver = {
        .driver = {
                .name = MT9M032_NAME,
        },
-       .probe = mt9m032_probe,
+       .probe_new = mt9m032_probe,
        .remove = mt9m032_remove,
        .id_table = mt9m032_id_table,
 };

diff --git a/drivers/media/i2c/mt9t001.c b/drivers/media/i2c/mt9t001.c
index d5abe4a7ef078cb183ac9bcd2a5924216201abac..c635ed11388ad640e4d77d5165fd7f09885d5cd0 100644 (file)
--- a/drivers/media/i2c/mt9t001.c
+++ b/drivers/media/i2c/mt9t001.c
@@ -856,8 +856,7 @@ static const struct v4l2_subdev_internal_ops mt9t001_subdev_internal_ops = {
        .close = mt9t001_close,
 };
 
-static int mt9t001_probe(struct i2c_client *client,
-                        const struct i2c_device_id *did)
+static int mt9t001_probe(struct i2c_client *client)
 {
        struct mt9t001_platform_data *pdata = client->dev.platform_data;
        struct mt9t001 *mt9t001;
@@ -981,7 +980,7 @@ static struct i2c_driver mt9t001_driver = {
        .driver = {
                .name = "mt9t001",
        },
-       .probe          = mt9t001_probe,
+       .probe_new      = mt9t001_probe,
        .remove         = mt9t001_remove,
        .id_table       = mt9t001_id,
 };

diff --git a/drivers/media/i2c/mt9t112.c b/drivers/media/i2c/mt9t112.c
index ad564095d0cf1e82e1876b17aa5eae134e263d6d..a82f056787b895487739281c46729676d2ed79bd 100644 (file)
--- a/drivers/media/i2c/mt9t112.c
+++ b/drivers/media/i2c/mt9t112.c
@@ -1060,8 +1060,7 @@ done:
        return ret;
 }
 
-static int mt9t112_probe(struct i2c_client *client,
-                        const struct i2c_device_id *did)
+static int mt9t112_probe(struct i2c_client *client)
 {
        struct mt9t112_priv *priv;
        int ret;
@@ -1120,7 +1119,7 @@ static struct i2c_driver mt9t112_i2c_driver = {
        .driver = {
                .name = "mt9t112",
        },
-       .probe    = mt9t112_probe,
+       .probe_new = mt9t112_probe,
        .remove   = mt9t112_remove,
        .id_table = mt9t112_id,
 };

diff --git a/drivers/media/i2c/mt9v011.c b/drivers/media/i2c/mt9v011.c
index 9952ce06ebb22eddfbcd8c757909143d5cf40d66..c54c7fbf0963753dd70fedcde3a07fc16d1980dd 100644 (file)
--- a/drivers/media/i2c/mt9v011.c
+++ b/drivers/media/i2c/mt9v011.c
@@ -478,8 +478,7 @@ static const struct v4l2_subdev_ops mt9v011_ops = {
                        I2C Client & Driver
  ****************************************************************************/
 
-static int mt9v011_probe(struct i2c_client *c,
-                        const struct i2c_device_id *id)
+static int mt9v011_probe(struct i2c_client *c)
 {
        u16 version;
        struct mt9v011 *core;
@@ -586,7 +585,7 @@ static struct i2c_driver mt9v011_driver = {
        .driver = {
                .name   = "mt9v011",
        },
-       .probe          = mt9v011_probe,
+       .probe_new      = mt9v011_probe,
        .remove         = mt9v011_remove,
        .id_table       = mt9v011_id,
 };

diff --git a/drivers/media/i2c/noon010pc30.c b/drivers/media/i2c/noon010pc30.c
index ecaf5e9057f1fd9da3243298d6276a6d9437c791..144bef2835f7f7eec7d83c7195ca36464ade3313 100644 (file)
--- a/drivers/media/i2c/noon010pc30.c
+++ b/drivers/media/i2c/noon010pc30.c
@@ -702,8 +702,7 @@ static int noon010_detect(struct i2c_client *client, struct noon010_info *info)
        return ret == NOON010PC30_ID ? 0 : -ENODEV;
 }
 
-static int noon010_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int noon010_probe(struct i2c_client *client)
 {
        struct noon010_info *info;
        struct v4l2_subdev *sd;
@@ -810,7 +809,7 @@ static struct i2c_driver noon010_i2c_driver = {
        .driver = {
                .name = MODULE_NAME
        },
-       .probe          = noon010_probe,
+       .probe_new      = noon010_probe,
        .remove         = noon010_remove,
        .id_table       = noon010_id,
 };

diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index e618b613e0780ebd247d3c02d9e66cd7d404f4c9..69a7a2c590dbcf535454533d7e85d7a24aa399af 100644 (file)
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -1698,8 +1698,7 @@ static void ov13858_free_controls(struct ov13858 *ov13858)
        mutex_destroy(&ov13858->mutex);
 }
 
-static int ov13858_probe(struct i2c_client *client,
-                        const struct i2c_device_id *devid)
+static int ov13858_probe(struct i2c_client *client)
 {
        struct ov13858 *ov13858;
        int ret;
@@ -1807,7 +1806,7 @@ static struct i2c_driver ov13858_i2c_driver = {
                .pm = &ov13858_pm_ops,
                .acpi_match_table = ACPI_PTR(ov13858_acpi_ids),
        },
-       .probe = ov13858_probe,
+       .probe_new = ov13858_probe,
        .remove = ov13858_remove,
        .id_table = ov13858_id_table,
 };

diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c
index 18f041e985b7b967ad77aefd65c961fb4e6de1d3..4c0ea2ae671b33e38e4e84b363c09eba6ba2527c 100644 (file)
--- a/drivers/media/i2c/ov6650.c
+++ b/drivers/media/i2c/ov6650.c
@@ -1025,8 +1025,7 @@ static const struct v4l2_subdev_internal_ops ov6650_internal_ops = {
 /*
  * i2c_driver function
  */
-static int ov6650_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int ov6650_probe(struct i2c_client *client)
 {
        struct ov6650 *priv;
        int ret;
@@ -1114,7 +1113,7 @@ static struct i2c_driver ov6650_i2c_driver = {
        .driver = {
                .name = "ov6650",
        },
-       .probe    = ov6650_probe,
+       .probe_new = ov6650_probe,
        .remove   = ov6650_remove,
        .id_table = ov6650_id,
 };

diff --git a/drivers/media/i2c/ov7640.c b/drivers/media/i2c/ov7640.c
index 5e2d67f0f9f20a8912c13e8538ae00665fc14c08..e6751d5cc64bcd862162c8fcd3ca18c69232035d 100644 (file)
--- a/drivers/media/i2c/ov7640.c
+++ b/drivers/media/i2c/ov7640.c
@@ -42,8 +42,7 @@ static int write_regs(struct i2c_client *client,
 
 static const struct v4l2_subdev_ops ov7640_ops;
 
-static int ov7640_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ov7640_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct v4l2_subdev *sd;
@@ -87,7 +86,7 @@ static struct i2c_driver ov7640_driver = {
        .driver = {
                .name   = "ov7640",
        },
-       .probe = ov7640_probe,
+       .probe_new = ov7640_probe,
        .remove = ov7640_remove,
        .id_table = ov7640_id,
 };

diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c
index 8b80be33c5f47af2c3b6586d4360208c97065bfd..a80fa59bf2ae8567226f1be8e0395d9fe06cd860 100644 (file)
--- a/drivers/media/i2c/ov9640.c
+++ b/drivers/media/i2c/ov9640.c
@@ -682,8 +682,7 @@ static const struct v4l2_subdev_ops ov9640_subdev_ops = {
 /*
  * i2c_driver function
  */
-static int ov9640_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int ov9640_probe(struct i2c_client *client)
 {
        struct ov9640_priv *priv;
        int ret;
@@ -763,7 +762,7 @@ static struct i2c_driver ov9640_i2c_driver = {
        .driver = {
                .name = "ov9640",
        },
-       .probe    = ov9640_probe,
+       .probe_new = ov9640_probe,
        .remove   = ov9640_remove,
        .id_table = ov9640_id,
 };

diff --git a/drivers/media/i2c/rj54n1cb0c.c b/drivers/media/i2c/rj54n1cb0c.c
index 1c3502f34cd37f2ab88cafe4d6760557d5355794..9db5473daba0c51f15c8f02154028aa51dcb173f 100644 (file)
--- a/drivers/media/i2c/rj54n1cb0c.c
+++ b/drivers/media/i2c/rj54n1cb0c.c
@@ -1297,8 +1297,7 @@ done:
        return ret;
 }
 
-static int rj54n1_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int rj54n1_probe(struct i2c_client *client)
 {
        struct rj54n1 *rj54n1;
        struct i2c_adapter *adapter = client->adapter;
@@ -1422,7 +1421,7 @@ static struct i2c_driver rj54n1_i2c_driver = {
        .driver = {
                .name = "rj54n1cb0c",
        },
-       .probe          = rj54n1_probe,
+       .probe_new      = rj54n1_probe,
        .remove         = rj54n1_remove,
        .id_table       = rj54n1_id,
 };

diff --git a/drivers/media/i2c/s5k4ecgx.c b/drivers/media/i2c/s5k4ecgx.c
index 3dddcd9dd351c3af7b240ef7c086e35039489446..f266e848f52bdb3042b43c4e7d3cd1348684a9e2 100644 (file)
--- a/drivers/media/i2c/s5k4ecgx.c
+++ b/drivers/media/i2c/s5k4ecgx.c
@@ -929,8 +929,7 @@ static int s5k4ecgx_init_v4l2_ctrls(struct s5k4ecgx *priv)
        return 0;
 };
 
-static int s5k4ecgx_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int s5k4ecgx_probe(struct i2c_client *client)
 {
        struct s5k4ecgx_platform_data *pdata = client->dev.platform_data;
        struct v4l2_subdev *sd;
@@ -1018,7 +1017,7 @@ static struct i2c_driver v4l2_i2c_driver = {
        .driver = {
                .name = S5K4ECGX_DRIVER_NAME,
        },
-       .probe = s5k4ecgx_probe,
+       .probe_new = s5k4ecgx_probe,
        .remove = s5k4ecgx_remove,
        .id_table = s5k4ecgx_id,
 };

diff --git a/drivers/media/i2c/s5k6aa.c b/drivers/media/i2c/s5k6aa.c
index 059211788a65078f70895d2f9a57935a1855be59..5996153371fce61ab13b9e3c0d0bc4f8f8ed18e8 100644 (file)
--- a/drivers/media/i2c/s5k6aa.c
+++ b/drivers/media/i2c/s5k6aa.c
@@ -1544,8 +1544,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,
        return 0;
 }
 
-static int s5k6aa_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int s5k6aa_probe(struct i2c_client *client)
 {
        const struct s5k6aa_platform_data *pdata = client->dev.platform_data;
        struct v4l2_subdev *sd;
@@ -1641,7 +1640,7 @@ static struct i2c_driver s5k6aa_i2c_driver = {
        .driver = {
                .name = DRIVER_NAME
        },
-       .probe          = s5k6aa_probe,
+       .probe_new      = s5k6aa_probe,
        .remove         = s5k6aa_remove,
        .id_table       = s5k6aa_id,
 };

diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index d6a51beabd02a8892f25334ec32258fb4f9fad8d..8752f7cff611fa620ed4e59e7cdf2e7d73dfdeae 100644 (file)
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -448,8 +448,7 @@ static const struct v4l2_subdev_ops saa6588_ops = {
 
 /* ---------------------------------------------------------------------- */
 
-static int saa6588_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int saa6588_probe(struct i2c_client *client)
 {
        struct saa6588 *s;
        struct v4l2_subdev *sd;
@@ -506,7 +505,7 @@ static struct i2c_driver saa6588_driver = {
        .driver = {
                .name   = "saa6588",
        },
-       .probe          = saa6588_probe,
+       .probe_new      = saa6588_probe,
        .remove         = saa6588_remove,
        .id_table       = saa6588_id,
 };

diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 5928cc6f45956e2256fb8f5794b381f61e7a3acf..892d64fe6e818bf04c164043fd3506bbd2ac3dcb 100644 (file)
--- a/drivers/media/i2c/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
@@ -659,8 +659,7 @@ static const struct v4l2_subdev_ops saa6752hs_ops = {
        .pad = &saa6752hs_pad_ops,
 };
 
-static int saa6752hs_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int saa6752hs_probe(struct i2c_client *client)
 {
        struct saa6752hs_state *h;
        struct v4l2_subdev *sd;
@@ -782,7 +781,7 @@ static struct i2c_driver saa6752hs_driver = {
        .driver = {
                .name   = "saa6752hs",
        },
-       .probe          = saa6752hs_probe,
+       .probe_new      = saa6752hs_probe,
        .remove         = saa6752hs_remove,
        .id_table       = saa6752hs_id,
 };

diff --git a/drivers/media/i2c/saa7110.c b/drivers/media/i2c/saa7110.c
index 5067525d8b1118d977f98719cd8bca83991c9442..b58e71517376ad15a9723ccf8f47c971b98874b7 100644 (file)
--- a/drivers/media/i2c/saa7110.c
+++ b/drivers/media/i2c/saa7110.c
@@ -358,8 +358,7 @@ static const struct v4l2_subdev_ops saa7110_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int saa7110_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int saa7110_probe(struct i2c_client *client)
 {
        struct saa7110 *decoder;
        struct v4l2_subdev *sd;
@@ -449,7 +448,7 @@ static struct i2c_driver saa7110_driver = {
        .driver = {
                .name   = "saa7110",
        },
-       .probe          = saa7110_probe,
+       .probe_new      = saa7110_probe,
        .remove         = saa7110_remove,
        .id_table       = saa7110_id,
 };

diff --git a/drivers/media/i2c/saa717x.c b/drivers/media/i2c/saa717x.c
index 4f3d1b432a4ecac9b4736ae2d3071717d2c499bc..df01059076faf51b1a54bb96f1adee30ac2921ee 100644 (file)
--- a/drivers/media/i2c/saa717x.c
+++ b/drivers/media/i2c/saa717x.c
@@ -1228,8 +1228,7 @@ static const struct v4l2_subdev_ops saa717x_ops = {
 /* i2c implementation */
 
 /* ----------------------------------------------------------------------- */
-static int saa717x_probe(struct i2c_client *client,
-                        const struct i2c_device_id *did)
+static int saa717x_probe(struct i2c_client *client)
 {
        struct saa717x_state *decoder;
        struct v4l2_ctrl_handler *hdl;
@@ -1344,7 +1343,7 @@ static struct i2c_driver saa717x_driver = {
        .driver = {
                .name   = "saa717x",
        },
-       .probe          = saa717x_probe,
+       .probe_new      = saa717x_probe,
        .remove         = saa717x_remove,
        .id_table       = saa717x_id,
 };

diff --git a/drivers/media/i2c/saa7185.c b/drivers/media/i2c/saa7185.c
index 266462325d30efe72a29c853b0206faf36a3a20d..c78f2e95ba37c96419f30bcd172b2359000f3ea9 100644 (file)
--- a/drivers/media/i2c/saa7185.c
+++ b/drivers/media/i2c/saa7185.c
@@ -290,8 +290,7 @@ static const struct v4l2_subdev_ops saa7185_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int saa7185_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int saa7185_probe(struct i2c_client *client)
 {
        int i;
        struct saa7185 *encoder;
@@ -344,7 +343,7 @@ static struct i2c_driver saa7185_driver = {
        .driver = {
                .name   = "saa7185",
        },
-       .probe          = saa7185_probe,
+       .probe_new      = saa7185_probe,
        .remove         = saa7185_remove,
        .id_table       = saa7185_id,
 };

diff --git a/drivers/media/i2c/sony-btf-mpx.c b/drivers/media/i2c/sony-btf-mpx.c
index 927a9ec41463d30c4c77a40de4f9bb4b61a92cfc..eef6c8a7c9c95020c03ad70d9c6132e0fe82952f 100644 (file)
--- a/drivers/media/i2c/sony-btf-mpx.c
+++ b/drivers/media/i2c/sony-btf-mpx.c
@@ -331,8 +331,7 @@ static const struct v4l2_subdev_ops sony_btf_mpx_ops = {
 
 /* --------------------------------------------------------------------------*/
 
-static int sony_btf_mpx_probe(struct i2c_client *client,
-                               const struct i2c_device_id *id)
+static int sony_btf_mpx_probe(struct i2c_client *client)
 {
        struct sony_btf_mpx *t;
        struct v4l2_subdev *sd;
@@ -376,7 +375,7 @@ static struct i2c_driver sony_btf_mpx_driver = {
        .driver = {
                .name   = "sony-btf-mpx",
        },
-       .probe = sony_btf_mpx_probe,
+       .probe_new = sony_btf_mpx_probe,
        .remove = sony_btf_mpx_remove,
        .id_table = sony_btf_mpx_id,
 };

diff --git a/drivers/media/i2c/sr030pc30.c b/drivers/media/i2c/sr030pc30.c
index ff18693beb5c2128b3fd7e0cf61d97f85f85e16c..a83c8bf1c5dd9bc8c5a2a4c3d09e43cc3461276a 100644 (file)
--- a/drivers/media/i2c/sr030pc30.c
+++ b/drivers/media/i2c/sr030pc30.c
@@ -675,8 +675,7 @@ static int sr030pc30_detect(struct i2c_client *client)
 }
 
 
-static int sr030pc30_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int sr030pc30_probe(struct i2c_client *client)
 {
        struct sr030pc30_info *info;
        struct v4l2_subdev *sd;
@@ -751,7 +750,7 @@ static struct i2c_driver sr030pc30_i2c_driver = {
        .driver = {
                .name = MODULE_NAME
        },
-       .probe          = sr030pc30_probe,
+       .probe_new      = sr030pc30_probe,
        .remove         = sr030pc30_remove,
        .id_table       = sr030pc30_id,
 };

diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
index 11e918311b131f62f95dec221716452b6199e7b6..bbceaac8e0b327055da630545379a70ff3296136 100644 (file)
--- a/drivers/media/i2c/tda7432.c
+++ b/drivers/media/i2c/tda7432.c
@@ -343,8 +343,7 @@ static const struct v4l2_subdev_ops tda7432_ops = {
  * i2c interface functions *
  * *********************** */
 
-static int tda7432_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tda7432_probe(struct i2c_client *client)
 {
        struct tda7432 *t;
        struct v4l2_subdev *sd;
@@ -410,7 +409,7 @@ static struct i2c_driver tda7432_driver = {
        .driver = {
                .name   = "tda7432",
        },
-       .probe          = tda7432_probe,
+       .probe_new      = tda7432_probe,
        .remove         = tda7432_remove,
        .id_table       = tda7432_id,
 };

diff --git a/drivers/media/i2c/tda9840.c b/drivers/media/i2c/tda9840.c
index aaa74944fc7cd335bf8c551cbbe6519c5d178446..25fbd7e3950ef2150e027a22c084c604deb4aac1 100644 (file)
--- a/drivers/media/i2c/tda9840.c
+++ b/drivers/media/i2c/tda9840.c
@@ -149,8 +149,7 @@ static const struct v4l2_subdev_ops tda9840_ops = {
 
 /* ----------------------------------------------------------------------- */
 
-static int tda9840_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int tda9840_probe(struct i2c_client *client)
 {
        struct v4l2_subdev *sd;
 
@@ -192,7 +191,7 @@ static struct i2c_driver tda9840_driver = {
        .driver = {
                .name   = "tda9840",
        },
-       .probe          = tda9840_probe,
+       .probe_new      = tda9840_probe,
        .remove         = tda9840_remove,
        .id_table       = tda9840_id,
 };

diff --git a/drivers/media/i2c/tea6415c.c b/drivers/media/i2c/tea6415c.c
index 50e74314f315dd1f972fb46f5298c5aaa05326fc..d375d2d243544bad32f693ed7feb9b12ede2f488 100644 (file)
--- a/drivers/media/i2c/tea6415c.c
+++ b/drivers/media/i2c/tea6415c.c
@@ -116,8 +116,7 @@ static const struct v4l2_subdev_ops tea6415c_ops = {
        .video = &tea6415c_video_ops,
 };
 
-static int tea6415c_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int tea6415c_probe(struct i2c_client *client)
 {
        struct v4l2_subdev *sd;
 
@@ -151,7 +150,7 @@ static struct i2c_driver tea6415c_driver = {
        .driver = {
                .name   = "tea6415c",
        },
-       .probe          = tea6415c_probe,
+       .probe_new      = tea6415c_probe,
        .remove         = tea6415c_remove,
        .id_table       = tea6415c_id,
 };

diff --git a/drivers/media/i2c/tea6420.c b/drivers/media/i2c/tea6420.c
index 246f2b10ccc74cf36664d1da762285d27714ce9c..9da1f3b02c578389f3573c410b6bfa1a2f2de909 100644 (file)
--- a/drivers/media/i2c/tea6420.c
+++ b/drivers/media/i2c/tea6420.c
@@ -87,8 +87,7 @@ static const struct v4l2_subdev_ops tea6420_ops = {
        .audio = &tea6420_audio_ops,
 };
 
-static int tea6420_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int tea6420_probe(struct i2c_client *client)
 {
        struct v4l2_subdev *sd;
        int err, i;
@@ -133,7 +132,7 @@ static struct i2c_driver tea6420_driver = {
        .driver = {
                .name   = "tea6420",
        },
-       .probe          = tea6420_probe,
+       .probe_new      = tea6420_probe,
        .remove         = tea6420_remove,
        .id_table       = tea6420_id,
 };

diff --git a/drivers/media/i2c/ths7303.c b/drivers/media/i2c/ths7303.c
index 2a0f9a3d1a66bb55fee2deceae2eed79bf4ad54d..67de90cf696ebc43121054fe2a6f03ae6b68b4fc 100644 (file)
--- a/drivers/media/i2c/ths7303.c
+++ b/drivers/media/i2c/ths7303.c
@@ -322,8 +322,7 @@ static const struct v4l2_subdev_ops ths7303_ops = {
        .video  = &ths7303_video_ops,
 };
 
-static int ths7303_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ths7303_probe(struct i2c_client *client)
 {
        struct ths7303_platform_data *pdata = client->dev.platform_data;
        struct ths7303_state *state;
@@ -377,7 +376,7 @@ static struct i2c_driver ths7303_driver = {
        .driver = {
                .name   = "ths73x3",
        },
-       .probe          = ths7303_probe,
+       .probe_new      = ths7303_probe,
        .remove         = ths7303_remove,
        .id_table       = ths7303_id,
 };

diff --git a/drivers/media/i2c/tlv320aic23b.c b/drivers/media/i2c/tlv320aic23b.c
index 937fa1dbaecba259a3a2e679454a46f59b8e2cca..47198e803817baf63b4f662dad98be95618f3642 100644 (file)
--- a/drivers/media/i2c/tlv320aic23b.c
+++ b/drivers/media/i2c/tlv320aic23b.c
@@ -129,8 +129,7 @@ static const struct v4l2_subdev_ops tlv320aic23b_ops = {
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int tlv320aic23b_probe(struct i2c_client *client,
-                             const struct i2c_device_id *id)
+static int tlv320aic23b_probe(struct i2c_client *client)
 {
        struct tlv320aic23b_state *state;
        struct v4l2_subdev *sd;
@@ -198,7 +197,7 @@ static struct i2c_driver tlv320aic23b_driver = {
        .driver = {
                .name   = "tlv320aic23b",
        },
-       .probe          = tlv320aic23b_probe,
+       .probe_new      = tlv320aic23b_probe,
        .remove         = tlv320aic23b_remove,
        .id_table       = tlv320aic23b_id,
 };

diff --git a/drivers/media/i2c/tw2804.c b/drivers/media/i2c/tw2804.c
index c7c8dfe8a8a84d4fafc502bca1bff78dbc033966..710790ece11bc91daeaab4bd59646a6daef25b68 100644 (file)
--- a/drivers/media/i2c/tw2804.c
+++ b/drivers/media/i2c/tw2804.c
@@ -343,8 +343,7 @@ static const struct v4l2_subdev_ops tw2804_ops = {
        .video = &tw2804_video_ops,
 };
 
-static int tw2804_probe(struct i2c_client *client,
-                           const struct i2c_device_id *id)
+static int tw2804_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct tw2804 *state;
@@ -424,7 +423,7 @@ static struct i2c_driver tw2804_driver = {
        .driver = {
                .name   = "tw2804",
        },
-       .probe          = tw2804_probe,
+       .probe_new      = tw2804_probe,
        .remove         = tw2804_remove,
        .id_table       = tw2804_id,
 };

diff --git a/drivers/media/i2c/tw9903.c b/drivers/media/i2c/tw9903.c
index d7eef7986b75d039bf347874304568f102d2c6f5..428ee55787e1858259c678532ed9cd87dc855a20 100644 (file)
--- a/drivers/media/i2c/tw9903.c
+++ b/drivers/media/i2c/tw9903.c
@@ -189,8 +189,7 @@ static const struct v4l2_subdev_ops tw9903_ops = {
 
 /* --------------------------------------------------------------------------*/
 
-static int tw9903_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int tw9903_probe(struct i2c_client *client)
 {
        struct tw9903 *dec;
        struct v4l2_subdev *sd;
@@ -255,7 +254,7 @@ static struct i2c_driver tw9903_driver = {
        .driver = {
                .name   = "tw9903",
        },
-       .probe = tw9903_probe,
+       .probe_new = tw9903_probe,
        .remove = tw9903_remove,
        .id_table = tw9903_id,
 };

diff --git a/drivers/media/i2c/tw9906.c b/drivers/media/i2c/tw9906.c
index 549ad8f72f12b7e3aa9371017953bf59010e6fba..7824ed9b04ed6c1360135bde5b91a3ed304f35d0 100644 (file)
--- a/drivers/media/i2c/tw9906.c
+++ b/drivers/media/i2c/tw9906.c
@@ -157,8 +157,7 @@ static const struct v4l2_subdev_ops tw9906_ops = {
        .video = &tw9906_video_ops,
 };
 
-static int tw9906_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int tw9906_probe(struct i2c_client *client)
 {
        struct tw9906 *dec;
        struct v4l2_subdev *sd;
@@ -223,7 +222,7 @@ static struct i2c_driver tw9906_driver = {
        .driver = {
                .name   = "tw9906",
        },
-       .probe = tw9906_probe,
+       .probe_new = tw9906_probe,
        .remove = tw9906_remove,
        .id_table = tw9906_id,
 };

diff --git a/drivers/media/i2c/tw9910.c b/drivers/media/i2c/tw9910.c
index 853b5acead32bbaf851f109fa24b557abcfd52d4..459fa22f434114d4a6468c31b32ce2dd328c5449 100644 (file)
--- a/drivers/media/i2c/tw9910.c
+++ b/drivers/media/i2c/tw9910.c
@@ -928,8 +928,7 @@ static const struct v4l2_subdev_ops tw9910_subdev_ops = {
  * i2c_driver function
  */
 
-static int tw9910_probe(struct i2c_client *client,
-                       const struct i2c_device_id *did)
+static int tw9910_probe(struct i2c_client *client)
 
 {
        struct tw9910_priv              *priv;
@@ -1013,7 +1012,7 @@ static struct i2c_driver tw9910_i2c_driver = {
        .driver = {
                .name = "tw9910",
        },
-       .probe    = tw9910_probe,
+       .probe_new = tw9910_probe,
        .remove   = tw9910_remove,
        .id_table = tw9910_id,
 };

diff --git a/drivers/media/i2c/uda1342.c b/drivers/media/i2c/uda1342.c
index d0659c4392f283a79d9301ffc474456d7e71d0c0..b6873d8662728403f0a52afd1657877ee54f281e 100644 (file)
--- a/drivers/media/i2c/uda1342.c
+++ b/drivers/media/i2c/uda1342.c
@@ -45,8 +45,7 @@ static const struct v4l2_subdev_ops uda1342_ops = {
        .audio = &uda1342_audio_ops,
 };
 
-static int uda1342_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int uda1342_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct v4l2_subdev *sd;
@@ -89,7 +88,7 @@ static struct i2c_driver uda1342_driver = {
        .driver = {
                .name   = "uda1342",
        },
-       .probe          = uda1342_probe,
+       .probe_new      = uda1342_probe,
        .remove         = uda1342_remove,
        .id_table       = uda1342_id,
 };

diff --git a/drivers/media/i2c/upd64031a.c b/drivers/media/i2c/upd64031a.c
index 4de26ed2ba003dcf0a36d760382785e0721f60a8..47eed3aab060a595f0868c0e169a00582828d85f 100644 (file)
--- a/drivers/media/i2c/upd64031a.c
+++ b/drivers/media/i2c/upd64031a.c
@@ -183,8 +183,7 @@ static const struct v4l2_subdev_ops upd64031a_ops = {
 
 /* i2c implementation */
 
-static int upd64031a_probe(struct i2c_client *client,
-                          const struct i2c_device_id *id)
+static int upd64031a_probe(struct i2c_client *client)
 {
        struct upd64031a_state *state;
        struct v4l2_subdev *sd;
@@ -229,7 +228,7 @@ static struct i2c_driver upd64031a_driver = {
        .driver = {
                .name   = "upd64031a",
        },
-       .probe          = upd64031a_probe,
+       .probe_new      = upd64031a_probe,
        .remove         = upd64031a_remove,
        .id_table       = upd64031a_id,
 };

diff --git a/drivers/media/i2c/upd64083.c b/drivers/media/i2c/upd64083.c
index 2bfd5443d40683fa16ef8753908575e8530771d9..3f5a7d4853a129f29f11957a5bf2376548925ea1 100644 (file)
--- a/drivers/media/i2c/upd64083.c
+++ b/drivers/media/i2c/upd64083.c
@@ -154,8 +154,7 @@ static const struct v4l2_subdev_ops upd64083_ops = {
 
 /* i2c implementation */
 
-static int upd64083_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int upd64083_probe(struct i2c_client *client)
 {
        struct upd64083_state *state;
        struct v4l2_subdev *sd;
@@ -200,7 +199,7 @@ static struct i2c_driver upd64083_driver = {
        .driver = {
                .name   = "upd64083",
        },
-       .probe          = upd64083_probe,
+       .probe_new      = upd64083_probe,
        .remove         = upd64083_remove,
        .id_table       = upd64083_id,
 };

diff --git a/drivers/media/i2c/vp27smpx.c b/drivers/media/i2c/vp27smpx.c
index c832edad5fa7844174959f3a5c898bb0ed0973a6..ed1c58ea8ed33dbb5bab8c4756d9e7aa1a4e0bfb 100644 (file)
--- a/drivers/media/i2c/vp27smpx.c
+++ b/drivers/media/i2c/vp27smpx.c
@@ -138,8 +138,7 @@ static const struct v4l2_subdev_ops vp27smpx_ops = {
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int vp27smpx_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int vp27smpx_probe(struct i2c_client *client)
 {
        struct vp27smpx_state *state;
        struct v4l2_subdev *sd;
@@ -182,7 +181,7 @@ static struct i2c_driver vp27smpx_driver = {
        .driver = {
                .name   = "vp27smpx",
        },
-       .probe          = vp27smpx_probe,
+       .probe_new      = vp27smpx_probe,
        .remove         = vp27smpx_remove,
        .id_table       = vp27smpx_id,
 };

diff --git a/drivers/media/i2c/vpx3220.c b/drivers/media/i2c/vpx3220.c
index b481ec196b880976affd6dca2dcb6c1a3227b7cd..aa73d5dcc3e7325b50667aedfb64bb6c47b4e9ec 100644 (file)
--- a/drivers/media/i2c/vpx3220.c
+++ b/drivers/media/i2c/vpx3220.c
@@ -456,8 +456,7 @@ static const struct v4l2_subdev_ops vpx3220_ops = {
  * Client management code
  */
 
-static int vpx3220_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int vpx3220_probe(struct i2c_client *client)
 {
        struct vpx3220 *decoder;
        struct v4l2_subdev *sd;
@@ -547,7 +546,7 @@ static struct i2c_driver vpx3220_driver = {
        .driver = {
                .name   = "vpx3220",
        },
-       .probe          = vpx3220_probe,
+       .probe_new      = vpx3220_probe,
        .remove         = vpx3220_remove,
        .id_table       = vpx3220_id,
 };

diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
index d496bb45f2015a1825083f225f854f10578cdfb0..d35c5ec148f4a569adc9dc2783143d0466b0aea7 100644 (file)
--- a/drivers/media/i2c/vs6624.c
+++ b/drivers/media/i2c/vs6624.c
@@ -738,8 +738,7 @@ static const struct v4l2_subdev_ops vs6624_ops = {
        .pad = &vs6624_pad_ops,
 };
 
-static int vs6624_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int vs6624_probe(struct i2c_client *client)
 {
        struct vs6624 *sensor;
        struct v4l2_subdev *sd;
@@ -843,7 +842,7 @@ static struct i2c_driver vs6624_driver = {
        .driver = {
                .name   = "vs6624",
        },
-       .probe          = vs6624_probe,
+       .probe_new      = vs6624_probe,
        .remove         = vs6624_remove,
        .id_table       = vs6624_id,
 };

diff --git a/drivers/media/i2c/wm8739.c b/drivers/media/i2c/wm8739.c
index 180b3534752130b79e11cf9d51016264ed9a3f4e..8b34a673ffd3e3327b8f5accb9403e34c731dd60 100644 (file)
--- a/drivers/media/i2c/wm8739.c
+++ b/drivers/media/i2c/wm8739.c
@@ -178,8 +178,7 @@ static const struct v4l2_subdev_ops wm8739_ops = {
 
 /* i2c implementation */
 
-static int wm8739_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int wm8739_probe(struct i2c_client *client)
 {
        struct wm8739_state *state;
        struct v4l2_subdev *sd;
@@ -253,7 +252,7 @@ static struct i2c_driver wm8739_driver = {
        .driver = {
                .name   = "wm8739",
        },
-       .probe          = wm8739_probe,
+       .probe_new      = wm8739_probe,
        .remove         = wm8739_remove,
        .id_table       = wm8739_id,
 };

diff --git a/drivers/media/i2c/wm8775.c b/drivers/media/i2c/wm8775.c
index 8ff97867d3cdd9917228b44278e3bd38bdb16567..56d98518f7eb80a69f894e55475fb193861f7d4c 100644 (file)
--- a/drivers/media/i2c/wm8775.c
+++ b/drivers/media/i2c/wm8775.c
@@ -190,8 +190,7 @@ static const struct v4l2_subdev_ops wm8775_ops = {
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int wm8775_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int wm8775_probe(struct i2c_client *client)
 {
        struct wm8775_state *state;
        struct v4l2_subdev *sd;
@@ -299,7 +298,7 @@ static struct i2c_driver wm8775_driver = {
        .driver = {
                .name   = "wm8775",
        },
-       .probe          = wm8775_probe,
+       .probe_new      = wm8775_probe,
        .remove         = wm8775_remove,
        .id_table       = wm8775_id,
 };

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index abda40e816121f32e6776eb541e75290016084b9..2cb74afba49c1524c0562f91785a6430593b7fbf 100644 (file)
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -411,8 +411,7 @@ static const struct video_device tea5764_radio_template = {
 };
 
 /* I2C probe: check if the device exists and register with v4l if it is */
-static int tea5764_i2c_probe(struct i2c_client *client,
-                            const struct i2c_device_id *id)
+static int tea5764_i2c_probe(struct i2c_client *client)
 {
        struct tea5764_device *radio;
        struct v4l2_device *v4l2_dev;
@@ -512,7 +511,7 @@ static struct i2c_driver tea5764_i2c_driver = {
        .driver = {
                .name = "radio-tea5764",
        },
-       .probe = tea5764_i2c_probe,
+       .probe_new = tea5764_i2c_probe,
        .remove = tea5764_i2c_remove,
        .id_table = tea5764_id,
 };

diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index f9e990a9c3ef09335d20cfe47d9d155d877b3363..3c758a98334450c37942be4123d6b50f33a82c8d 100644 (file)
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -331,8 +331,7 @@ static const struct v4l2_subdev_ops empty_ops = {};
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int saa7706h_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int saa7706h_probe(struct i2c_client *client)
 {
        struct saa7706h_state *state;
        struct v4l2_subdev *sd;
@@ -406,7 +405,7 @@ static struct i2c_driver saa7706h_driver = {
        .driver = {
                .name   = DRIVER_NAME,
        },
-       .probe          = saa7706h_probe,
+       .probe_new      = saa7706h_probe,
        .remove         = saa7706h_remove,
        .id_table       = saa7706h_id,
 };

diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 7b0870a9785b0de5758d4f28822fa37985ec5b70..d14c97d79e8346effae253d88832c0a3957453c9 100644 (file)
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -141,8 +141,7 @@ static const struct v4l2_subdev_ops tef6862_ops = {
  * concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
  */
 
-static int tef6862_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int tef6862_probe(struct i2c_client *client)
 {
        struct tef6862_state *state;
        struct v4l2_subdev *sd;
@@ -184,7 +183,7 @@ static struct i2c_driver tef6862_driver = {
        .driver = {
                .name   = DRIVER_NAME,
        },
-       .probe          = tef6862_probe,
+       .probe_new      = tef6862_probe,
        .remove         = tef6862_remove,
        .id_table       = tef6862_id,
 };

diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
index e7959ab1add8d47ab7cde613a5300a8d17ad04e2..c2300b30407b1098e68ce7806f73c3b915eaf846 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
@@ -412,8 +412,7 @@ static const struct i2c_device_id vidtv_demod_i2c_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_demod_i2c_id_table);
 
-static int vidtv_demod_i2c_probe(struct i2c_client *client,
-                                const struct i2c_device_id *id)
+static int vidtv_demod_i2c_probe(struct i2c_client *client)
 {
        struct vidtv_tuner_config *config = client->dev.platform_data;
        struct vidtv_demod_state *state;
@@ -450,7 +449,7 @@ static struct i2c_driver vidtv_demod_i2c_driver = {
                .name                = "dvb_vidtv_demod",
                .suppress_bind_attrs = true,
        },
-       .probe    = vidtv_demod_i2c_probe,
+       .probe_new = vidtv_demod_i2c_probe,
        .remove   = vidtv_demod_i2c_remove,
        .id_table = vidtv_demod_i2c_id_table,
 };

diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
index aabc97ed736b81462667428d78f6f8dbe7bf18c6..55a4387f3854e017cca6a46223cefa64bfdfb161 100644 (file)
--- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
@@ -390,8 +390,7 @@ static const struct i2c_device_id vidtv_tuner_i2c_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, vidtv_tuner_i2c_id_table);
 
-static int vidtv_tuner_i2c_probe(struct i2c_client *client,
-                                const struct i2c_device_id *id)
+static int vidtv_tuner_i2c_probe(struct i2c_client *client)
 {
        struct vidtv_tuner_config *config = client->dev.platform_data;
        struct dvb_frontend *fe           = config->fe;
@@ -426,7 +425,7 @@ static struct i2c_driver vidtv_tuner_i2c_driver = {
                .name                = "dvb_vidtv_tuner",
                .suppress_bind_attrs = true,
        },
-       .probe    = vidtv_tuner_i2c_probe,
+       .probe_new = vidtv_tuner_i2c_probe,
        .remove   = vidtv_tuner_i2c_remove,
        .id_table = vidtv_tuner_i2c_id_table,
 };

diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
index 61ae884ea59a23828b51ac86e9eb4602eba3d4a3..7c269f3159ef0a26a3b4b669bd7f821cf9b20f4e 100644 (file)
--- a/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@ -609,8 +609,7 @@ static const struct dvb_tuner_ops e4000_dvb_tuner_ops = {
        .get_if_frequency = e4000_dvb_get_if_frequency,
 };
 
-static int e4000_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int e4000_probe(struct i2c_client *client)
 {
        struct e4000_dev *dev;
        struct e4000_config *cfg = client->dev.platform_data;
@@ -730,7 +729,7 @@ static struct i2c_driver e4000_driver = {
                .name   = "e4000",
                .suppress_bind_attrs = true,
        },
-       .probe          = e4000_probe,
+       .probe_new      = e4000_probe,
        .remove         = e4000_remove,
        .id_table       = e4000_id_table,
 };

diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c
index f30932e1a0f38a3fad3bb091daf218929bb527d1..3cd8279f4f2e0a4529ab47ce1346cea4835a5777 100644 (file)
--- a/drivers/media/tuners/fc2580.c
+++ b/drivers/media/tuners/fc2580.c
@@ -506,8 +506,7 @@ static struct v4l2_subdev *fc2580_get_v4l2_subdev(struct i2c_client *client)
                return NULL;
 }
 
-static int fc2580_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int fc2580_probe(struct i2c_client *client)
 {
        struct fc2580_dev *dev;
        struct fc2580_platform_data *pdata = client->dev.platform_data;
@@ -611,7 +610,7 @@ static struct i2c_driver fc2580_driver = {
                .name   = "fc2580",
                .suppress_bind_attrs = true,
        },
-       .probe          = fc2580_probe,
+       .probe_new      = fc2580_probe,
        .remove         = fc2580_remove,
        .id_table       = fc2580_id_table,
 };

diff --git a/drivers/media/tuners/m88rs6000t.c b/drivers/media/tuners/m88rs6000t.c
index e32e3e9daa15c8632524af53c761165cb7aaea94..7d172a5a66d9bce8e478232e2056a5f0b213a675 100644 (file)
--- a/drivers/media/tuners/m88rs6000t.c
+++ b/drivers/media/tuners/m88rs6000t.c
@@ -573,8 +573,7 @@ static const struct dvb_tuner_ops m88rs6000t_tuner_ops = {
        .get_rf_strength = m88rs6000t_get_rf_strength,
 };
 
-static int m88rs6000t_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int m88rs6000t_probe(struct i2c_client *client)
 {
        struct m88rs6000t_config *cfg = client->dev.platform_data;
        struct dvb_frontend *fe = cfg->fe;
@@ -719,7 +718,7 @@ static struct i2c_driver m88rs6000t_driver = {
        .driver = {
                .name   = "m88rs6000t",
        },
-       .probe          = m88rs6000t_probe,
+       .probe_new      = m88rs6000t_probe,
        .remove         = m88rs6000t_remove,
        .id_table       = m88rs6000t_id,
 };

diff --git a/drivers/media/tuners/mt2060.c b/drivers/media/tuners/mt2060.c
index 322c806228a5a4ed371147c64ed7bf14a1e078ca..e5d86874adb34eaf2ebb34573328b28afb9b3c48 100644 (file)
--- a/drivers/media/tuners/mt2060.c
+++ b/drivers/media/tuners/mt2060.c
@@ -442,8 +442,7 @@ struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter
 }
 EXPORT_SYMBOL(mt2060_attach);
 
-static int mt2060_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int mt2060_probe(struct i2c_client *client)
 {
        struct mt2060_platform_data *pdata = client->dev.platform_data;
        struct dvb_frontend *fe;
@@ -525,7 +524,7 @@ static struct i2c_driver mt2060_driver = {
                .name = "mt2060",
                .suppress_bind_attrs = true,
        },
-       .probe          = mt2060_probe,
+       .probe_new      = mt2060_probe,
        .remove         = mt2060_remove,
        .id_table       = mt2060_id_table,
 };

diff --git a/drivers/media/tuners/mxl301rf.c b/drivers/media/tuners/mxl301rf.c
index 6422056185a9aa67d893c8345ac8cfc48a661eac..c35442a77ae5157b2a23a390c0f049babfc61062 100644 (file)
--- a/drivers/media/tuners/mxl301rf.c
+++ b/drivers/media/tuners/mxl301rf.c
@@ -283,8 +283,7 @@ static const struct dvb_tuner_ops mxl301rf_ops = {
 };
 
 
-static int mxl301rf_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int mxl301rf_probe(struct i2c_client *client)
 {
        struct mxl301rf_state *state;
        struct mxl301rf_config *cfg;
@@ -327,7 +326,7 @@ static struct i2c_driver mxl301rf_driver = {
        .driver = {
                .name   = "mxl301rf",
        },
-       .probe          = mxl301rf_probe,
+       .probe_new      = mxl301rf_probe,
        .remove         = mxl301rf_remove,
        .id_table       = mxl301rf_id,
 };

diff --git a/drivers/media/tuners/qm1d1b0004.c b/drivers/media/tuners/qm1d1b0004.c
index 9cba0893207cc6db862f9d99e22ed4da4da75f01..0b6f750c54add47565ff7ea9c69b8495df9bfc37 100644 (file)
--- a/drivers/media/tuners/qm1d1b0004.c
+++ b/drivers/media/tuners/qm1d1b0004.c
@@ -197,7 +197,7 @@ static const struct dvb_tuner_ops qm1d1b0004_ops = {
 };
 
 static int
-qm1d1b0004_probe(struct i2c_client *client, const struct i2c_device_id *id)
+qm1d1b0004_probe(struct i2c_client *client)
 {
        struct dvb_frontend *fe;
        struct qm1d1b0004_config *cfg;
@@ -253,7 +253,7 @@ static struct i2c_driver qm1d1b0004_driver = {
        .driver = {
                .name = "qm1d1b0004",
        },
-       .probe    = qm1d1b0004_probe,
+       .probe_new = qm1d1b0004_probe,
        .remove   = qm1d1b0004_remove,
        .id_table = qm1d1b0004_id,
 };

diff --git a/drivers/media/tuners/qm1d1c0042.c b/drivers/media/tuners/qm1d1c0042.c
index 2d60bf501fb5c06a44ffe707bb4c87e54c78c360..f9be7a721d2c549eeba7fad2672db26a31321870 100644 (file)
--- a/drivers/media/tuners/qm1d1c0042.c
+++ b/drivers/media/tuners/qm1d1c0042.c
@@ -401,8 +401,7 @@ static const struct dvb_tuner_ops qm1d1c0042_ops = {
 };
 
 
-static int qm1d1c0042_probe(struct i2c_client *client,
-                           const struct i2c_device_id *id)
+static int qm1d1c0042_probe(struct i2c_client *client)
 {
        struct qm1d1c0042_state *state;
        struct qm1d1c0042_config *cfg;
@@ -444,7 +443,7 @@ static struct i2c_driver qm1d1c0042_driver = {
        .driver = {
                .name   = "qm1d1c0042",
        },
-       .probe          = qm1d1c0042_probe,
+       .probe_new      = qm1d1c0042_probe,
        .remove         = qm1d1c0042_remove,
        .id_table       = qm1d1c0042_id,
 };

diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index eb97711c9c685882c0bcc62d504fa04631f28cce..5fdf05a974154f493ebca0d3f1569e0d6b7757c0 100644 (file)
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -173,8 +173,7 @@ static const struct dvb_tuner_ops tda18212_tuner_ops = {
        .get_if_frequency = tda18212_get_if_frequency,
 };
 
-static int tda18212_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int tda18212_probe(struct i2c_client *client)
 {
        struct tda18212_config *cfg = client->dev.platform_data;
        struct dvb_frontend *fe = cfg->fe;
@@ -264,7 +263,7 @@ static struct i2c_driver tda18212_driver = {
        .driver = {
                .name   = "tda18212",
        },
-       .probe          = tda18212_probe,
+       .probe_new      = tda18212_probe,
        .remove         = tda18212_remove,
        .id_table       = tda18212_id,
 };

diff --git a/drivers/media/tuners/tda18250.c b/drivers/media/tuners/tda18250.c
index e404a5afad4c9716201d4cc0b5c150644fd8c28c..66ff2d035de705791a3343d300ac278e554120a3 100644 (file)
--- a/drivers/media/tuners/tda18250.c
+++ b/drivers/media/tuners/tda18250.c
@@ -741,8 +741,7 @@ static const struct dvb_tuner_ops tda18250_ops = {
        .sleep = tda18250_sleep,
 };
 
-static int tda18250_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int tda18250_probe(struct i2c_client *client)
 {
        struct tda18250_config *cfg = client->dev.platform_data;
        struct dvb_frontend *fe = cfg->fe;
@@ -878,7 +877,7 @@ static struct i2c_driver tda18250_driver = {
        .driver = {
                .name   = "tda18250",
        },
-       .probe          = tda18250_probe,
+       .probe_new      = tda18250_probe,
        .remove         = tda18250_remove,
        .id_table       = tda18250_id_table,
 };

diff --git a/drivers/media/tuners/tua9001.c b/drivers/media/tuners/tua9001.c
index d141d000b8195322c3d36f9d28c67def17996de9..ac38afd3441a03b4981a4f2d75fec694cf277899 100644 (file)
--- a/drivers/media/tuners/tua9001.c
+++ b/drivers/media/tuners/tua9001.c
@@ -167,8 +167,7 @@ static const struct dvb_tuner_ops tua9001_tuner_ops = {
        .get_if_frequency = tua9001_get_if_frequency,
 };
 
-static int tua9001_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int tua9001_probe(struct i2c_client *client)
 {
        struct tua9001_dev *dev;
        struct tua9001_platform_data *pdata = client->dev.platform_data;
@@ -256,7 +255,7 @@ static struct i2c_driver tua9001_driver = {
                .name   = "tua9001",
                .suppress_bind_attrs = true,
        },
-       .probe          = tua9001_probe,
+       .probe_new      = tua9001_probe,
        .remove         = tua9001_remove,
        .id_table       = tua9001_id_table,
 };

diff --git a/drivers/media/usb/go7007/s2250-board.c b/drivers/media/usb/go7007/s2250-board.c
index 2f45188bf9d474829ee1d44ece09fa109e6ad612..29dfcc6d0b0aa4e9b6551401dde3bae661a6719b 100644 (file)
--- a/drivers/media/usb/go7007/s2250-board.c
+++ b/drivers/media/usb/go7007/s2250-board.c
@@ -494,8 +494,7 @@ static const struct v4l2_subdev_ops s2250_ops = {
 
 /* --------------------------------------------------------------------------*/
 
-static int s2250_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int s2250_probe(struct i2c_client *client)
 {
        struct i2c_client *audio;
        struct i2c_adapter *adapter = client->adapter;
@@ -621,7 +620,7 @@ static struct i2c_driver s2250_driver = {
        .driver = {
                .name   = "s2250",
        },
-       .probe          = s2250_probe,
+       .probe_new      = s2250_probe,
        .remove         = s2250_remove,
        .id_table       = s2250_id,
 };

diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 33162dc1daf697f6b6d1ec4da99050b1ed11a532..1c0d23c5220376eb0fa6e6d80c71089d927e1645 100644 (file)
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -614,7 +614,6 @@ static void tuner_lookup(struct i2c_adapter *adap,
  *tuner_probe - Probes the existing tuners on an I2C bus
  *
  * @client:    i2c_client descriptor
- * @id:                not used
  *
  * This routine probes for tuners at the expected I2C addresses. On most
  * cases, if a device answers to a given I2C address, it assumes that the
@@ -625,8 +624,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
  * During client attach, set_type is called by adapter's attach_inform callback.
  * set_type must then be completed by tuner_probe.
  */
-static int tuner_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int tuner_probe(struct i2c_client *client)
 {
        struct tuner *t;
        struct tuner *radio;
@@ -1413,7 +1411,7 @@ static struct i2c_driver tuner_driver = {
                .name   = "tuner",
                .pm     = &tuner_pm_ops,
        },
-       .probe          = tuner_probe,
+       .probe_new      = tuner_probe,
        .remove         = tuner_remove,
        .command        = tuner_command,
        .id_table       = tuner_id,