media: staging: atomisp: Switch i2c drivers to use ->probe_new()

Since most of the drivers are being used on ACPI enabled platforms
there is no need to keep legacy API support for them. Thus, switch
to ->probe_new() callback and remove orphaned code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/i2c/Kconfig b/drivers/staging/media/atomisp/i2c/Kconfig
index 7aa5d77b5def2c741b9cefb9cfc35e2926925a25..db054d3c7ed6bb4a94b6328308815926f429241e 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/Kconfig
+++ b/drivers/staging/media/atomisp/i2c/Kconfig
@@ -6,6 +6,7 @@ source "drivers/staging/media/atomisp/i2c/ov5693/Kconfig"
 
 config VIDEO_ATOMISP_OV2722
        tristate "OVT ov2722 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
         This is a Video4Linux2 sensor-level driver for the OVT
@@ -17,6 +18,7 @@ config VIDEO_ATOMISP_OV2722
 
 config VIDEO_ATOMISP_GC2235
        tristate "Galaxy gc2235 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
         This is a Video4Linux2 sensor-level driver for the OVT
@@ -28,6 +30,7 @@ config VIDEO_ATOMISP_GC2235
 
 config VIDEO_ATOMISP_OV8858
        tristate "Omnivision ov8858 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2 && VIDEO_ATOMISP
        ---help---
         This is a Video4Linux2 sensor-level driver for the Omnivision
@@ -49,6 +52,7 @@ config VIDEO_ATOMISP_MSRLIST_HELPER
 
 config VIDEO_ATOMISP_MT9M114
        tristate "Aptina mt9m114 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
         This is a Video4Linux2 sensor-level driver for the Micron
@@ -60,6 +64,7 @@ config VIDEO_ATOMISP_MT9M114
 
 config VIDEO_ATOMISP_GC0310
        tristate "GC0310 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
          This is a Video4Linux2 sensor-level driver for the Galaxycore
@@ -67,6 +72,7 @@ config VIDEO_ATOMISP_GC0310
         
 config VIDEO_ATOMISP_OV2680
        tristate "Omnivision OV2680 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
         This is a Video4Linux2 sensor-level driver for the Omnivision
@@ -82,6 +88,7 @@ config VIDEO_ATOMISP_OV2680
 
 config VIDEO_ATOMISP_LM3554
        tristate "LM3554 flash light driver"
+       depends on ACPI
        depends on VIDEO_V4L2 && I2C
        ---help---
         This is a Video4Linux2 sub-dev driver for the LM3554
@@ -89,5 +96,3 @@ config VIDEO_ATOMISP_LM3554
 
         To compile this driver as a module, choose M here: the
         module will be called lm3554
-
-

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
index 5a7e20ae59a243479a76a5ba9b87bc1b75a5c141..aafa4db55a5723437df03ce79d146388f6289fc8 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
@@ -1375,8 +1375,7 @@ static int gc0310_remove(struct i2c_client *client)
        return 0;
 }
 
-static int gc0310_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int gc0310_probe(struct i2c_client *client)
 {
        struct gc0310_device *dev;
        int ret;
@@ -1455,18 +1454,15 @@ static const struct acpi_device_id gc0310_acpi_match[] = {
        {"INT0310"},
        {},
 };
-
 MODULE_DEVICE_TABLE(acpi, gc0310_acpi_match);
 
-MODULE_DEVICE_TABLE(i2c, gc0310_id);
 static struct i2c_driver gc0310_driver = {
        .driver = {
-               .name = GC0310_NAME,
-               .acpi_match_table = ACPI_PTR(gc0310_acpi_match),
+               .name = "gc0310",
+               .acpi_match_table = gc0310_acpi_match,
        },
-       .probe = gc0310_probe,
+       .probe_new = gc0310_probe,
        .remove = gc0310_remove,
-       .id_table = gc0310_id,
 };
 module_i2c_driver(gc0310_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
index 30f41d9853eaf1351aa867dd0077c91ff7e4352f..ab64598c482f97ab02be524a2fa114960e798677 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
@@ -1114,8 +1114,7 @@ static int gc2235_remove(struct i2c_client *client)
        return 0;
 }
 
-static int gc2235_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int gc2235_probe(struct i2c_client *client)
 {
        struct gc2235_device *dev;
        void *gcpdev;
@@ -1185,17 +1184,15 @@ static const struct acpi_device_id gc2235_acpi_match[] = {
        { "INT33F8" },
        {},
 };
-
 MODULE_DEVICE_TABLE(acpi, gc2235_acpi_match);
-MODULE_DEVICE_TABLE(i2c, gc2235_id);
+
 static struct i2c_driver gc2235_driver = {
        .driver = {
-               .name = GC2235_NAME,
-               .acpi_match_table = ACPI_PTR(gc2235_acpi_match),
+               .name = "gc2235",
+               .acpi_match_table = gc2235_acpi_match,
        },
-       .probe = gc2235_probe,
+       .probe_new = gc2235_probe,
        .remove = gc2235_remove,
-       .id_table = gc2235_id,
 };
 module_i2c_driver(gc2235_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
index 6abda48afe593d09858127ab34d40ec8d0772264..a4e8a55db587a153023307d348d8fb9751ecb2eb 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
@@ -862,8 +862,7 @@ static void *lm3554_platform_data_func(struct i2c_client *client)
        return &platform_data;
 }
 
-static int lm3554_probe(struct i2c_client *client,
-                                 const struct i2c_device_id *id)
+static int lm3554_probe(struct i2c_client *client)
 {
        int err = 0;
        struct lm3554 *flash;
@@ -960,13 +959,6 @@ fail:
        return ret;
 }
 
-static const struct i2c_device_id lm3554_id[] = {
-       {LM3554_NAME, 0},
-       {},
-};
-
-MODULE_DEVICE_TABLE(i2c, lm3554_id);
-
 static const struct dev_pm_ops lm3554_pm_ops = {
        .suspend = lm3554_suspend,
        .resume = lm3554_resume,
@@ -976,18 +968,16 @@ static const struct acpi_device_id lm3554_acpi_match[] = {
        { "INTCF1C" },
        {},
 };
-
 MODULE_DEVICE_TABLE(acpi, lm3554_acpi_match);
 
 static struct i2c_driver lm3554_driver = {
        .driver = {
-               .name = LM3554_NAME,
+               .name = "lm3554",
                .pm   = &lm3554_pm_ops,
-               .acpi_match_table = ACPI_PTR(lm3554_acpi_match),
+               .acpi_match_table = lm3554_acpi_match,
        },
-       .probe = lm3554_probe,
+       .probe_new = lm3554_probe,
        .remove = lm3554_remove,
-       .id_table = lm3554_id,
 };
 module_i2c_driver(lm3554_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index e627522414aa818a0d90b3ea3b3da4f4ad68bf22..b80f86e6d91a20465fee8274f61226ff929cb129 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1853,8 +1853,7 @@ static int mt9m114_remove(struct i2c_client *client)
        return 0;
 }
 
-static int mt9m114_probe(struct i2c_client *client,
-                      const struct i2c_device_id *id)
+static int mt9m114_probe(struct i2c_client *client)
 {
        struct mt9m114_device *dev;
        int ret = 0;
@@ -1924,24 +1923,20 @@ static int mt9m114_probe(struct i2c_client *client,
        return 0;
 }
 
-MODULE_DEVICE_TABLE(i2c, mt9m114_id);
-
 static const struct acpi_device_id mt9m114_acpi_match[] = {
        { "INT33F0" },
        { "CRMT1040" },
        {},
 };
-
 MODULE_DEVICE_TABLE(acpi, mt9m114_acpi_match);
 
 static struct i2c_driver mt9m114_driver = {
        .driver = {
                .name = "mt9m114",
-               .acpi_match_table = ACPI_PTR(mt9m114_acpi_match),
+               .acpi_match_table = mt9m114_acpi_match,
        },
-       .probe = mt9m114_probe,
+       .probe_new = mt9m114_probe,
        .remove = mt9m114_remove,
-       .id_table = mt9m114_id,
 };
 module_i2c_driver(mt9m114_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 8a4147308eb8bbda18cfb63536b8a87a7d7f1b96..219a856fc34e2b0a8cedd5a67ae1a5e83be73dc5 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -1438,8 +1438,7 @@ static int ov2680_remove(struct i2c_client *client)
        return 0;
 }
 
-static int ov2680_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ov2680_probe(struct i2c_client *client)
 {
        struct ov2680_device *dev;
        int ret;
@@ -1521,21 +1520,16 @@ static const struct acpi_device_id ov2680_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, ov2680_acpi_match);
 
-
-MODULE_DEVICE_TABLE(i2c, ov2680_id);
 static struct i2c_driver ov2680_driver = {
        .driver = {
-               .name = OV2680_NAME,
-               .acpi_match_table = ACPI_PTR(ov2680_acpi_match),
-
+               .name = "ov2680",
+               .acpi_match_table = ov2680_acpi_match,
        },
-       .probe = ov2680_probe,
+       .probe_new = ov2680_probe,
        .remove = ov2680_remove,
-       .id_table = ov2680_id,
 };
 module_i2c_driver(ov2680_driver);
 
 MODULE_AUTHOR("Jacky Wang <Jacky_wang@ovt.com>");
 MODULE_DESCRIPTION("A low-level driver for OmniVision 2680 sensors");
 MODULE_LICENSE("GPL");
-

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
index c031cbe006933e9bbb303031429e7e590df7980a..ac827e302654d8bb5ae2f819471d257ec1d5ebf9 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
@@ -1276,8 +1276,7 @@ static int __ov2722_init_ctrl_handler(struct ov2722_device *dev)
        return 0;
 }
 
-static int ov2722_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ov2722_probe(struct i2c_client *client)
 {
        struct ov2722_device *dev;
        void *ovpdev;
@@ -1333,23 +1332,19 @@ out_free:
        return ret;
 }
 
-MODULE_DEVICE_TABLE(i2c, ov2722_id);
-
 static const struct acpi_device_id ov2722_acpi_match[] = {
        { "INT33FB" },
        {},
 };
-
 MODULE_DEVICE_TABLE(acpi, ov2722_acpi_match);
 
 static struct i2c_driver ov2722_driver = {
        .driver = {
-               .name = OV2722_NAME,
-               .acpi_match_table = ACPI_PTR(ov2722_acpi_match),
+               .name = "ov2722",
+               .acpi_match_table = ov2722_acpi_match,
        },
-       .probe = ov2722_probe,
+       .probe_new = ov2722_probe,
        .remove = ov2722_remove,
-       .id_table = ov2722_id,
 };
 module_i2c_driver(ov2722_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/gc0310.h b/drivers/staging/media/atomisp/i2c/gc0310.h
index 7d8a0aeecb6c1f20998d2c0f334a97aa004d4ac9..7e97e45b4f79c49ec0ecbb1e3c3d9de160a66fd3 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/gc0310.h
+++ b/drivers/staging/media/atomisp/i2c/gc0310.h
@@ -36,8 +36,6 @@
 
 #include "../include/linux/atomisp_platform.h"
 
-#define GC0310_NAME            "gc0310"
-
 /* Defines for register writes and register array processing */
 #define I2C_MSG_LENGTH         1
 #define I2C_RETRY_COUNT                5
@@ -196,11 +194,6 @@ struct gc0310_write_ctrl {
        struct gc0310_write_buffer buffer;
 };
 
-static const struct i2c_device_id gc0310_id[] = {
-       {GC0310_NAME, 0},
-       {}
-};
-
 /*
  * Register settings for various resolution
  */

diff --git a/drivers/staging/media/atomisp/i2c/gc2235.h b/drivers/staging/media/atomisp/i2c/gc2235.h
index a8d6aa9c9a5da6ce4ba37444624cab27ff9b39b4..3c30a05c3991eb9d34e52a5d8810164ddca73c61 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/gc2235.h
+++ b/drivers/staging/media/atomisp/i2c/gc2235.h
@@ -33,8 +33,6 @@
 
 #include "../include/linux/atomisp_platform.h"
 
-#define GC2235_NAME            "gc2235"
-
 /* Defines for register writes and register array processing */
 #define I2C_MSG_LENGTH         0x2
 #define I2C_RETRY_COUNT                5
@@ -200,11 +198,6 @@ struct gc2235_write_ctrl {
        struct gc2235_write_buffer buffer;
 };
 
-static const struct i2c_device_id gc2235_id[] = {
-       {GC2235_NAME, 0},
-       {}
-};
-
 static struct gc2235_reg const gc2235_stream_on[] = {
        { GC2235_8BIT, 0xfe, 0x03}, /* switch to P3 */
        { GC2235_8BIT, 0x10, 0x91}, /* start mipi */

diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.h b/drivers/staging/media/atomisp/i2c/mt9m114.h
index 5e7d79d2e01bff2c64c1befee57b19fc73fef902..1ad1b1ac55e7b4609557c8a9df353860fbde734d 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/mt9m114.h
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.h
@@ -394,11 +394,6 @@ static struct mt9m114_res_struct mt9m114_res[] = {
 };
 #define N_RES (ARRAY_SIZE(mt9m114_res))
 
-static const struct i2c_device_id mt9m114_id[] = {
-       {"mt9m114", 0},
-       {}
-};
-
 static struct misensor_reg const mt9m114_exitstandby[] = {
        {MISENSOR_16BIT,  0x098E, 0xDC00},
        /* exit-standby */

diff --git a/drivers/staging/media/atomisp/i2c/ov2680.h b/drivers/staging/media/atomisp/i2c/ov2680.h
index ab8907e6c9efa1e20b9def2f8f5dff3a4318984c..198c158de3f219e16387566d11a5fce72ff08370 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov2680.h
+++ b/drivers/staging/media/atomisp/i2c/ov2680.h
@@ -35,10 +35,6 @@
 
 #include "../include/linux/atomisp_platform.h"
 
-#define OV2680_NAME            "ov2680"
-#define OV2680B_NAME   "ov2680b"
-#define OV2680F_NAME   "ov2680f"
-
 /* Defines for register writes and register array processing */
 #define I2C_MSG_LENGTH         0x2
 #define I2C_RETRY_COUNT                5
@@ -227,12 +223,6 @@ struct ov2680_format {
                struct ov2680_write_buffer buffer;
        };
 
-       static const struct i2c_device_id ov2680_id[] = {
-               {OV2680B_NAME, 0},
-               {OV2680F_NAME, 0},
-               {}
-       };
-
        static struct ov2680_reg const ov2680_global_setting[] = {
            {OV2680_8BIT, 0x0103, 0x01},
            {OV2680_8BIT, 0x3002, 0x00},

diff --git a/drivers/staging/media/atomisp/i2c/ov2722.h b/drivers/staging/media/atomisp/i2c/ov2722.h
index 73ecb167971896f6f7b5e64a3cf069ac4cf5938d..3ee8eaadba492a0acd95a2b212e32a3738891ef1 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov2722.h
+++ b/drivers/staging/media/atomisp/i2c/ov2722.h
@@ -35,8 +35,6 @@
 
 #include "../include/linux/atomisp_platform.h"
 
-#define OV2722_NAME            "ov2722"
-
 #define OV2722_POWER_UP_RETRY_NUM 5
 
 /* Defines for register writes and register array processing */
@@ -257,11 +255,6 @@ struct ov2722_write_ctrl {
        struct ov2722_write_buffer buffer;
 };
 
-static const struct i2c_device_id ov2722_id[] = {
-       {OV2722_NAME, 0},
-       {}
-};
-
 /*
  * Register settings for various resolution
  */

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/Kconfig b/drivers/staging/media/atomisp/i2c/ov5693/Kconfig
index 5fe4113bbf08575ef9387c1278810530f8e335e3..3f527f2047a745faafda8415ceae84ccc016b505 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/Kconfig
+++ b/drivers/staging/media/atomisp/i2c/ov5693/Kconfig
@@ -1,5 +1,6 @@
 config VIDEO_ATOMISP_OV5693
        tristate "Omnivision ov5693 sensor support"
+       depends on ACPI
        depends on I2C && VIDEO_V4L2
        ---help---
         This is a Video4Linux2 sensor-level driver for the Micron
@@ -8,4 +9,3 @@ config VIDEO_ATOMISP_OV5693
         ov5693 is video camera sensor.
 
         It currently only works with the atomisp driver.
-

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index 0a2b9e64f2c8e60e9d9cda335a6767c19fdb7e9e..863cf2d9297fa8c045a7fa0eef98e6ff531eb04d 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -1935,8 +1935,7 @@ static int ov5693_remove(struct i2c_client *client)
        return 0;
 }
 
-static int ov5693_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ov5693_probe(struct i2c_client *client)
 {
        struct ov5693_device *dev;
        int i2c;
@@ -2021,8 +2020,6 @@ out_free:
        return ret;
 }
 
-MODULE_DEVICE_TABLE(i2c, ov5693_id);
-
 static const struct acpi_device_id ov5693_acpi_match[] = {
        {"INT33BE"},
        {},
@@ -2031,12 +2028,11 @@ MODULE_DEVICE_TABLE(acpi, ov5693_acpi_match);
 
 static struct i2c_driver ov5693_driver = {
        .driver = {
-               .name = OV5693_NAME,
-               .acpi_match_table = ACPI_PTR(ov5693_acpi_match),
+               .name = "ov5693",
+               .acpi_match_table = ov5693_acpi_match,
        },
-       .probe = ov5693_probe,
+       .probe_new = ov5693_probe,
        .remove = ov5693_remove,
-       .id_table = ov5693_id,
 };
 module_i2c_driver(ov5693_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
index 8c2e6794463bc5bd47b476c1093ba9e9cb8a2d8f..b94a72a300d485c097595369123ff0f9cab2e09a 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
+++ b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
@@ -35,8 +35,6 @@
 
 #include "../../include/linux/atomisp_platform.h"
 
-#define OV5693_NAME            "ov5693"
-
 #define OV5693_POWER_UP_RETRY_NUM 5
 
 /* Defines for register writes and register array processing */
@@ -278,11 +276,6 @@ struct ov5693_write_ctrl {
        struct ov5693_write_buffer buffer;
 };
 
-static const struct i2c_device_id ov5693_id[] = {
-       {OV5693_NAME, 0},
-       {}
-};
-
 static struct ov5693_reg const ov5693_global_setting[] = {
        {OV5693_8BIT, 0x0103, 0x01},
        {OV5693_8BIT, 0x3001, 0x0a},

diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c
index 3ea157c7ee031136426c721b877890be33c8130a..10383b8b6ecb4867c88d0fd10e8461cf6ec6c979 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858.c
+++ b/drivers/staging/media/atomisp/i2c/ov8858.c
@@ -2080,8 +2080,7 @@ static const struct v4l2_ctrl_config ctrls[] = {
        }
 };
 
-static int ov8858_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+static int ov8858_probe(struct i2c_client *client)
 {
        struct ov8858_device *dev;
        unsigned int i;
@@ -2097,8 +2096,6 @@ static int ov8858_probe(struct i2c_client *client,
 
        mutex_init(&dev->input_lock);
 
-       if (id)
-               dev->i2c_id = id->driver_data;
        dev->fmt_idx = 0;
        dev->sensor_id = OV_ID_DEFAULT;
        dev->vcm_driver = &ov8858_vcms[OV8858_ID_DEFAULT];
@@ -2178,26 +2175,19 @@ out_free:
        return ret;
 }
 
-static const struct i2c_device_id ov8858_id[] = {
-       {OV8858_NAME, 0},
-       {}
-};
-
-MODULE_DEVICE_TABLE(i2c, ov8858_id);
-
 static const struct acpi_device_id ov8858_acpi_match[] = {
        {"INT3477"},
        {},
 };
+MODULE_DEVICE_TABLE(acpi, ov8858_acpi_match);
 
 static struct i2c_driver ov8858_driver = {
        .driver = {
-               .name = OV8858_NAME,
-               .acpi_match_table = ACPI_PTR(ov8858_acpi_match),
+               .name = "ov8858",
+               .acpi_match_table = ov8858_acpi_match,
        },
-       .probe = ov8858_probe,
+       .probe_new = ov8858_probe,
        .remove = ov8858_remove,
-       .id_table = ov8858_id,
 };
 module_i2c_driver(ov8858_driver);
 

diff --git a/drivers/staging/media/atomisp/i2c/ov8858.h b/drivers/staging/media/atomisp/i2c/ov8858.h
index 638d1a803a2b23fb52ed39c04eaf2ee5a8093e64..0f1b76e49a34fdddd1a0c69d89b259ed23834c2c 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858.h
+++ b/drivers/staging/media/atomisp/i2c/ov8858.h
@@ -113,7 +113,6 @@
 
 #define OV_SUBDEV_PREFIX                       "ov"
 #define OV_ID_DEFAULT                          0x0000
-#define        OV8858_NAME                             "ov8858"
 #define OV8858_CHIP_ID                         0x8858
 
 #define OV8858_LONG_EXPO                       0x3500

diff --git a/drivers/staging/media/atomisp/i2c/ov8858_btns.h b/drivers/staging/media/atomisp/i2c/ov8858_btns.h
index 7d74a8899fae84b1a02893f5eb54b47bb0719b86..5cf03c220876ed1e5a997bd70b91d72c42e704b4 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov8858_btns.h
+++ b/drivers/staging/media/atomisp/i2c/ov8858_btns.h
@@ -113,7 +113,6 @@
 
 #define OV_SUBDEV_PREFIX                       "ov"
 #define OV_ID_DEFAULT                          0x0000
-#define        OV8858_NAME                             "ov8858"
 #define OV8858_CHIP_ID                         0x8858
 
 #define OV8858_LONG_EXPO                       0x3500

diff --git a/drivers/staging/media/atomisp/include/media/lm3554.h b/drivers/staging/media/atomisp/include/media/lm3554.h
index 7d6a8c05dd5286efc0cdbe174fd3957f4adf2f7d..df17d546f661504f9883e2de469beb6f6229ef94 100644 (file)
--- a/drivers/staging/media/atomisp/include/media/lm3554.h
+++ b/drivers/staging/media/atomisp/include/media/lm3554.h
@@ -24,7 +24,6 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-subdev.h>
 
-#define LM3554_NAME    "lm3554"
 #define LM3554_ID      3554
 
 #define        v4l2_queryctrl_entry_integer(_id, _name,\