Skip to content

L
linux
Commit e19c9205 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files
Options

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2cb63c4c
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 129 deletions
drivers/staging/media/atomisp/i2c/Kconfig
View file @ e19c9205
...@@ -6,6 +6,7 @@ source "drivers/staging/media/atomisp/i2c/ov5693/Kconfig" ...@@ -6,6 +6,7 @@ source "drivers/staging/media/atomisp/i2c/ov5693/Kconfig"
config VIDEO_ATOMISP_OV2722 config VIDEO_ATOMISP_OV2722
tristate "OVT ov2722 sensor support" tristate "OVT ov2722 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the OVT This is a Video4Linux2 sensor-level driver for the OVT
...@@ -17,6 +18,7 @@ config VIDEO_ATOMISP_OV2722 ...@@ -17,6 +18,7 @@ config VIDEO_ATOMISP_OV2722
config VIDEO_ATOMISP_GC2235 config VIDEO_ATOMISP_GC2235
tristate "Galaxy gc2235 sensor support" tristate "Galaxy gc2235 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the OVT This is a Video4Linux2 sensor-level driver for the OVT
...@@ -28,6 +30,7 @@ config VIDEO_ATOMISP_GC2235 ...@@ -28,6 +30,7 @@ config VIDEO_ATOMISP_GC2235
config VIDEO_ATOMISP_OV8858 config VIDEO_ATOMISP_OV8858
tristate "Omnivision ov8858 sensor support" tristate "Omnivision ov8858 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 && VIDEO_ATOMISP depends on I2C && VIDEO_V4L2 && VIDEO_ATOMISP
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the Omnivision This is a Video4Linux2 sensor-level driver for the Omnivision
...@@ -49,6 +52,7 @@ config VIDEO_ATOMISP_MSRLIST_HELPER ...@@ -49,6 +52,7 @@ config VIDEO_ATOMISP_MSRLIST_HELPER
config VIDEO_ATOMISP_MT9M114 config VIDEO_ATOMISP_MT9M114
tristate "Aptina mt9m114 sensor support" tristate "Aptina mt9m114 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the Micron This is a Video4Linux2 sensor-level driver for the Micron
...@@ -60,6 +64,7 @@ config VIDEO_ATOMISP_MT9M114 ...@@ -60,6 +64,7 @@ config VIDEO_ATOMISP_MT9M114
config VIDEO_ATOMISP_GC0310 config VIDEO_ATOMISP_GC0310
tristate "GC0310 sensor support" tristate "GC0310 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the Galaxycore This is a Video4Linux2 sensor-level driver for the Galaxycore
...@@ -67,6 +72,7 @@ config VIDEO_ATOMISP_GC0310 ...@@ -67,6 +72,7 @@ config VIDEO_ATOMISP_GC0310
config VIDEO_ATOMISP_OV2680 config VIDEO_ATOMISP_OV2680
tristate "Omnivision OV2680 sensor support" tristate "Omnivision OV2680 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the Omnivision This is a Video4Linux2 sensor-level driver for the Omnivision
...@@ -82,6 +88,7 @@ config VIDEO_ATOMISP_OV2680 ...@@ -82,6 +88,7 @@ config VIDEO_ATOMISP_OV2680
config VIDEO_ATOMISP_LM3554 config VIDEO_ATOMISP_LM3554
tristate "LM3554 flash light driver" tristate "LM3554 flash light driver"
depends on ACPI
depends on VIDEO_V4L2 && I2C depends on VIDEO_V4L2 && I2C
---help--- ---help---
This is a Video4Linux2 sub-dev driver for the LM3554 This is a Video4Linux2 sub-dev driver for the LM3554
...@@ -89,5 +96,3 @@ config VIDEO_ATOMISP_LM3554 ...@@ -89,5 +96,3 @@ config VIDEO_ATOMISP_LM3554
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called lm3554 module will be called lm3554
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c
View file @ e19c9205
...@@ -1375,8 +1375,7 @@ static int gc0310_remove(struct i2c_client *client) ...@@ -1375,8 +1375,7 @@ static int gc0310_remove(struct i2c_client *client)
return 0; return 0;
} }
static int gc0310_probe(struct i2c_client *client, static int gc0310_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct gc0310_device *dev; struct gc0310_device *dev;
int ret; int ret;
...@@ -1455,18 +1454,15 @@ static const struct acpi_device_id gc0310_acpi_match[] = { ...@@ -1455,18 +1454,15 @@ static const struct acpi_device_id gc0310_acpi_match[] = {
{"INT0310"}, {"INT0310"},
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, gc0310_acpi_match); MODULE_DEVICE_TABLE(acpi, gc0310_acpi_match);
MODULE_DEVICE_TABLE(i2c, gc0310_id);
static struct i2c_driver gc0310_driver = { static struct i2c_driver gc0310_driver = {
.driver = { .driver = {
.name = GC0310_NAME, .name = "gc0310",
.acpi_match_table = ACPI_PTR(gc0310_acpi_match), .acpi_match_table = gc0310_acpi_match,
}, },
.probe = gc0310_probe, .probe_new = gc0310_probe,
.remove = gc0310_remove, .remove = gc0310_remove,
.id_table = gc0310_id,
}; };
module_i2c_driver(gc0310_driver); module_i2c_driver(gc0310_driver);
......
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c
View file @ e19c9205
...@@ -1114,8 +1114,7 @@ static int gc2235_remove(struct i2c_client *client) ...@@ -1114,8 +1114,7 @@ static int gc2235_remove(struct i2c_client *client)
return 0; return 0;
} }
static int gc2235_probe(struct i2c_client *client, static int gc2235_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct gc2235_device *dev; struct gc2235_device *dev;
void *gcpdev; void *gcpdev;
...@@ -1185,17 +1184,15 @@ static const struct acpi_device_id gc2235_acpi_match[] = { ...@@ -1185,17 +1184,15 @@ static const struct acpi_device_id gc2235_acpi_match[] = {
{ "INT33F8" }, { "INT33F8" },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, gc2235_acpi_match); MODULE_DEVICE_TABLE(acpi, gc2235_acpi_match);
MODULE_DEVICE_TABLE(i2c, gc2235_id);
static struct i2c_driver gc2235_driver = { static struct i2c_driver gc2235_driver = {
.driver = { .driver = {
.name = GC2235_NAME, .name = "gc2235",
.acpi_match_table = ACPI_PTR(gc2235_acpi_match), .acpi_match_table = gc2235_acpi_match,
}, },
.probe = gc2235_probe, .probe_new = gc2235_probe,
.remove = gc2235_remove, .remove = gc2235_remove,
.id_table = gc2235_id,
}; };
module_i2c_driver(gc2235_driver); module_i2c_driver(gc2235_driver);
......
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c
View file @ e19c9205
...@@ -862,8 +862,7 @@ static void *lm3554_platform_data_func(struct i2c_client *client) ...@@ -862,8 +862,7 @@ static void *lm3554_platform_data_func(struct i2c_client *client)
return &platform_data; return &platform_data;
} }
static int lm3554_probe(struct i2c_client *client, static int lm3554_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
int err = 0; int err = 0;
struct lm3554 *flash; struct lm3554 *flash;
...@@ -960,13 +959,6 @@ static int lm3554_remove(struct i2c_client *client) ...@@ -960,13 +959,6 @@ static int lm3554_remove(struct i2c_client *client)
return ret; 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 = { static const struct dev_pm_ops lm3554_pm_ops = {
.suspend = lm3554_suspend, .suspend = lm3554_suspend,
.resume = lm3554_resume, .resume = lm3554_resume,
...@@ -976,18 +968,16 @@ static const struct acpi_device_id lm3554_acpi_match[] = { ...@@ -976,18 +968,16 @@ static const struct acpi_device_id lm3554_acpi_match[] = {
{ "INTCF1C" }, { "INTCF1C" },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, lm3554_acpi_match); MODULE_DEVICE_TABLE(acpi, lm3554_acpi_match);
static struct i2c_driver lm3554_driver = { static struct i2c_driver lm3554_driver = {
.driver = { .driver = {
.name = LM3554_NAME, .name = "lm3554",
.pm = &lm3554_pm_ops, .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, .remove = lm3554_remove,
.id_table = lm3554_id,
}; };
module_i2c_driver(lm3554_driver); module_i2c_driver(lm3554_driver);
......
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
View file @ e19c9205
...@@ -1853,8 +1853,7 @@ static int mt9m114_remove(struct i2c_client *client) ...@@ -1853,8 +1853,7 @@ static int mt9m114_remove(struct i2c_client *client)
return 0; return 0;
} }
static int mt9m114_probe(struct i2c_client *client, static int mt9m114_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct mt9m114_device *dev; struct mt9m114_device *dev;
int ret = 0; int ret = 0;
...@@ -1924,24 +1923,20 @@ static int mt9m114_probe(struct i2c_client *client, ...@@ -1924,24 +1923,20 @@ static int mt9m114_probe(struct i2c_client *client,
return 0; return 0;
} }
MODULE_DEVICE_TABLE(i2c, mt9m114_id);
static const struct acpi_device_id mt9m114_acpi_match[] = { static const struct acpi_device_id mt9m114_acpi_match[] = {
{ "INT33F0" }, { "INT33F0" },
{ "CRMT1040" }, { "CRMT1040" },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, mt9m114_acpi_match); MODULE_DEVICE_TABLE(acpi, mt9m114_acpi_match);
static struct i2c_driver mt9m114_driver = { static struct i2c_driver mt9m114_driver = {
.driver = { .driver = {
.name = "mt9m114", .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, .remove = mt9m114_remove,
.id_table = mt9m114_id,
}; };
module_i2c_driver(mt9m114_driver); module_i2c_driver(mt9m114_driver);
......
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View file @ e19c9205
...@@ -1438,8 +1438,7 @@ static int ov2680_remove(struct i2c_client *client) ...@@ -1438,8 +1438,7 @@ static int ov2680_remove(struct i2c_client *client)
return 0; return 0;
} }
static int ov2680_probe(struct i2c_client *client, static int ov2680_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct ov2680_device *dev; struct ov2680_device *dev;
int ret; int ret;
...@@ -1521,21 +1520,16 @@ static const struct acpi_device_id ov2680_acpi_match[] = { ...@@ -1521,21 +1520,16 @@ static const struct acpi_device_id ov2680_acpi_match[] = {
}; };
MODULE_DEVICE_TABLE(acpi, ov2680_acpi_match); MODULE_DEVICE_TABLE(acpi, ov2680_acpi_match);
MODULE_DEVICE_TABLE(i2c, ov2680_id);
static struct i2c_driver ov2680_driver = { static struct i2c_driver ov2680_driver = {
.driver = { .driver = {
.name = OV2680_NAME, .name = "ov2680",
.acpi_match_table = ACPI_PTR(ov2680_acpi_match), .acpi_match_table = ov2680_acpi_match,
}, },
.probe = ov2680_probe, .probe_new = ov2680_probe,
.remove = ov2680_remove, .remove = ov2680_remove,
.id_table = ov2680_id,
}; };
module_i2c_driver(ov2680_driver); module_i2c_driver(ov2680_driver);
MODULE_AUTHOR("Jacky Wang <Jacky_wang@ovt.com>"); MODULE_AUTHOR("Jacky Wang <Jacky_wang@ovt.com>");
MODULE_DESCRIPTION("A low-level driver for OmniVision 2680 sensors"); MODULE_DESCRIPTION("A low-level driver for OmniVision 2680 sensors");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c
View file @ e19c9205
...@@ -1276,8 +1276,7 @@ static int __ov2722_init_ctrl_handler(struct ov2722_device *dev) ...@@ -1276,8 +1276,7 @@ static int __ov2722_init_ctrl_handler(struct ov2722_device *dev)
return 0; return 0;
} }
static int ov2722_probe(struct i2c_client *client, static int ov2722_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct ov2722_device *dev; struct ov2722_device *dev;
void *ovpdev; void *ovpdev;
...@@ -1333,23 +1332,19 @@ static int ov2722_probe(struct i2c_client *client, ...@@ -1333,23 +1332,19 @@ static int ov2722_probe(struct i2c_client *client,
return ret; return ret;
} }
MODULE_DEVICE_TABLE(i2c, ov2722_id);
static const struct acpi_device_id ov2722_acpi_match[] = { static const struct acpi_device_id ov2722_acpi_match[] = {
{ "INT33FB" }, { "INT33FB" },
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, ov2722_acpi_match); MODULE_DEVICE_TABLE(acpi, ov2722_acpi_match);
static struct i2c_driver ov2722_driver = { static struct i2c_driver ov2722_driver = {
.driver = { .driver = {
.name = OV2722_NAME, .name = "ov2722",
.acpi_match_table = ACPI_PTR(ov2722_acpi_match), .acpi_match_table = ov2722_acpi_match,
}, },
.probe = ov2722_probe, .probe_new = ov2722_probe,
.remove = ov2722_remove, .remove = ov2722_remove,
.id_table = ov2722_id,
}; };
module_i2c_driver(ov2722_driver); module_i2c_driver(ov2722_driver);
......
drivers/staging/media/atomisp/i2c/gc0310.h
View file @ e19c9205
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
#include "../include/linux/atomisp_platform.h" #include "../include/linux/atomisp_platform.h"
#define GC0310_NAME "gc0310"
/* Defines for register writes and register array processing */ /* Defines for register writes and register array processing */
#define I2C_MSG_LENGTH 1 #define I2C_MSG_LENGTH 1
#define I2C_RETRY_COUNT 5 #define I2C_RETRY_COUNT 5
...@@ -196,11 +194,6 @@ struct gc0310_write_ctrl { ...@@ -196,11 +194,6 @@ struct gc0310_write_ctrl {
struct gc0310_write_buffer buffer; struct gc0310_write_buffer buffer;
}; };
static const struct i2c_device_id gc0310_id[] = {
{GC0310_NAME, 0},
{}
};
/* /*
* Register settings for various resolution * Register settings for various resolution
*/ */
......
drivers/staging/media/atomisp/i2c/gc2235.h
View file @ e19c9205
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include "../include/linux/atomisp_platform.h" #include "../include/linux/atomisp_platform.h"
#define GC2235_NAME "gc2235"
/* Defines for register writes and register array processing */ /* Defines for register writes and register array processing */
#define I2C_MSG_LENGTH 0x2 #define I2C_MSG_LENGTH 0x2
#define I2C_RETRY_COUNT 5 #define I2C_RETRY_COUNT 5
...@@ -200,11 +198,6 @@ struct gc2235_write_ctrl { ...@@ -200,11 +198,6 @@ struct gc2235_write_ctrl {
struct gc2235_write_buffer buffer; struct gc2235_write_buffer buffer;
}; };
static const struct i2c_device_id gc2235_id[] = {
{GC2235_NAME, 0},
{}
};
static struct gc2235_reg const gc2235_stream_on[] = { static struct gc2235_reg const gc2235_stream_on[] = {
{ GC2235_8BIT, 0xfe, 0x03}, /* switch to P3 */ { GC2235_8BIT, 0xfe, 0x03}, /* switch to P3 */
{ GC2235_8BIT, 0x10, 0x91}, /* start mipi */ { GC2235_8BIT, 0x10, 0x91}, /* start mipi */
......
drivers/staging/media/atomisp/i2c/mt9m114.h
View file @ e19c9205
...@@ -394,11 +394,6 @@ static struct mt9m114_res_struct mt9m114_res[] = { ...@@ -394,11 +394,6 @@ static struct mt9m114_res_struct mt9m114_res[] = {
}; };
#define N_RES (ARRAY_SIZE(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[] = { static struct misensor_reg const mt9m114_exitstandby[] = {
{MISENSOR_16BIT, 0x098E, 0xDC00}, {MISENSOR_16BIT, 0x098E, 0xDC00},
/* exit-standby */ /* exit-standby */
......
drivers/staging/media/atomisp/i2c/ov2680.h
View file @ e19c9205
...@@ -35,10 +35,6 @@ ...@@ -35,10 +35,6 @@
#include "../include/linux/atomisp_platform.h" #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 */ /* Defines for register writes and register array processing */
#define I2C_MSG_LENGTH 0x2 #define I2C_MSG_LENGTH 0x2
#define I2C_RETRY_COUNT 5 #define I2C_RETRY_COUNT 5
...@@ -227,12 +223,6 @@ struct ov2680_format { ...@@ -227,12 +223,6 @@ struct ov2680_format {
struct ov2680_write_buffer buffer; 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[] = { static struct ov2680_reg const ov2680_global_setting[] = {
{OV2680_8BIT, 0x0103, 0x01}, {OV2680_8BIT, 0x0103, 0x01},
{OV2680_8BIT, 0x3002, 0x00}, {OV2680_8BIT, 0x3002, 0x00},
......
drivers/staging/media/atomisp/i2c/ov2722.h
View file @ e19c9205
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
#include "../include/linux/atomisp_platform.h" #include "../include/linux/atomisp_platform.h"
#define OV2722_NAME "ov2722"
#define OV2722_POWER_UP_RETRY_NUM 5 #define OV2722_POWER_UP_RETRY_NUM 5
/* Defines for register writes and register array processing */ /* Defines for register writes and register array processing */
...@@ -257,11 +255,6 @@ struct ov2722_write_ctrl { ...@@ -257,11 +255,6 @@ struct ov2722_write_ctrl {
struct ov2722_write_buffer buffer; struct ov2722_write_buffer buffer;
}; };
static const struct i2c_device_id ov2722_id[] = {
{OV2722_NAME, 0},
{}
};
/* /*
* Register settings for various resolution * Register settings for various resolution
*/ */
......
drivers/staging/media/atomisp/i2c/ov5693/Kconfig
View file @ e19c9205
config VIDEO_ATOMISP_OV5693 config VIDEO_ATOMISP_OV5693
tristate "Omnivision ov5693 sensor support" tristate "Omnivision ov5693 sensor support"
depends on ACPI
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
---help--- ---help---
This is a Video4Linux2 sensor-level driver for the Micron This is a Video4Linux2 sensor-level driver for the Micron
...@@ -8,4 +9,3 @@ config VIDEO_ATOMISP_OV5693 ...@@ -8,4 +9,3 @@ config VIDEO_ATOMISP_OV5693
ov5693 is video camera sensor. ov5693 is video camera sensor.
It currently only works with the atomisp driver. It currently only works with the atomisp driver.
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
View file @ e19c9205
...@@ -1935,8 +1935,7 @@ static int ov5693_remove(struct i2c_client *client) ...@@ -1935,8 +1935,7 @@ static int ov5693_remove(struct i2c_client *client)
return 0; return 0;
} }
static int ov5693_probe(struct i2c_client *client, static int ov5693_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct ov5693_device *dev; struct ov5693_device *dev;
int i2c; int i2c;
...@@ -2021,8 +2020,6 @@ static int ov5693_probe(struct i2c_client *client, ...@@ -2021,8 +2020,6 @@ static int ov5693_probe(struct i2c_client *client,
return ret; return ret;
} }
MODULE_DEVICE_TABLE(i2c, ov5693_id);
static const struct acpi_device_id ov5693_acpi_match[] = { static const struct acpi_device_id ov5693_acpi_match[] = {
{"INT33BE"}, {"INT33BE"},
{}, {},
...@@ -2031,12 +2028,11 @@ MODULE_DEVICE_TABLE(acpi, ov5693_acpi_match); ...@@ -2031,12 +2028,11 @@ MODULE_DEVICE_TABLE(acpi, ov5693_acpi_match);
static struct i2c_driver ov5693_driver = { static struct i2c_driver ov5693_driver = {
.driver = { .driver = {
.name = OV5693_NAME, .name = "ov5693",
.acpi_match_table = ACPI_PTR(ov5693_acpi_match), .acpi_match_table = ov5693_acpi_match,
}, },
.probe = ov5693_probe, .probe_new = ov5693_probe,
.remove = ov5693_remove, .remove = ov5693_remove,
.id_table = ov5693_id,
}; };
module_i2c_driver(ov5693_driver); module_i2c_driver(ov5693_driver);
......
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
View file @ e19c9205
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
#include "../../include/linux/atomisp_platform.h" #include "../../include/linux/atomisp_platform.h"
#define OV5693_NAME "ov5693"
#define OV5693_POWER_UP_RETRY_NUM 5 #define OV5693_POWER_UP_RETRY_NUM 5
/* Defines for register writes and register array processing */ /* Defines for register writes and register array processing */
...@@ -278,11 +276,6 @@ struct ov5693_write_ctrl { ...@@ -278,11 +276,6 @@ struct ov5693_write_ctrl {
struct ov5693_write_buffer buffer; struct ov5693_write_buffer buffer;
}; };
static const struct i2c_device_id ov5693_id[] = {
{OV5693_NAME, 0},
{}
};
static struct ov5693_reg const ov5693_global_setting[] = { static struct ov5693_reg const ov5693_global_setting[] = {
{OV5693_8BIT, 0x0103, 0x01}, {OV5693_8BIT, 0x0103, 0x01},
{OV5693_8BIT, 0x3001, 0x0a}, {OV5693_8BIT, 0x3001, 0x0a},
......
drivers/staging/media/atomisp/i2c/ov8858.c
View file @ e19c9205
...@@ -2080,8 +2080,7 @@ static const struct v4l2_ctrl_config ctrls[] = { ...@@ -2080,8 +2080,7 @@ static const struct v4l2_ctrl_config ctrls[] = {
} }
}; };
static int ov8858_probe(struct i2c_client *client, static int ov8858_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct ov8858_device *dev; struct ov8858_device *dev;
unsigned int i; unsigned int i;
...@@ -2097,8 +2096,6 @@ static int ov8858_probe(struct i2c_client *client, ...@@ -2097,8 +2096,6 @@ static int ov8858_probe(struct i2c_client *client,
mutex_init(&dev->input_lock); mutex_init(&dev->input_lock);
if (id)
dev->i2c_id = id->driver_data;
dev->fmt_idx = 0; dev->fmt_idx = 0;
dev->sensor_id = OV_ID_DEFAULT; dev->sensor_id = OV_ID_DEFAULT;
dev->vcm_driver = &ov8858_vcms[OV8858_ID_DEFAULT]; dev->vcm_driver = &ov8858_vcms[OV8858_ID_DEFAULT];
...@@ -2178,26 +2175,19 @@ static int ov8858_probe(struct i2c_client *client, ...@@ -2178,26 +2175,19 @@ static int ov8858_probe(struct i2c_client *client,
return ret; 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[] = { static const struct acpi_device_id ov8858_acpi_match[] = {
{"INT3477"}, {"INT3477"},
{}, {},
}; };
MODULE_DEVICE_TABLE(acpi, ov8858_acpi_match);
static struct i2c_driver ov8858_driver = { static struct i2c_driver ov8858_driver = {
.driver = { .driver = {
.name = OV8858_NAME, .name = "ov8858",
.acpi_match_table = ACPI_PTR(ov8858_acpi_match), .acpi_match_table = ov8858_acpi_match,
}, },
.probe = ov8858_probe, .probe_new = ov8858_probe,
.remove = ov8858_remove, .remove = ov8858_remove,
.id_table = ov8858_id,
}; };
module_i2c_driver(ov8858_driver); module_i2c_driver(ov8858_driver);
......
drivers/staging/media/atomisp/i2c/ov8858.h
View file @ e19c9205
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
#define OV_SUBDEV_PREFIX "ov" #define OV_SUBDEV_PREFIX "ov"
#define OV_ID_DEFAULT 0x0000 #define OV_ID_DEFAULT 0x0000
#define OV8858_NAME "ov8858"
#define OV8858_CHIP_ID 0x8858 #define OV8858_CHIP_ID 0x8858
#define OV8858_LONG_EXPO 0x3500 #define OV8858_LONG_EXPO 0x3500
......
drivers/staging/media/atomisp/i2c/ov8858_btns.h
View file @ e19c9205
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
#define OV_SUBDEV_PREFIX "ov" #define OV_SUBDEV_PREFIX "ov"
#define OV_ID_DEFAULT 0x0000 #define OV_ID_DEFAULT 0x0000
#define OV8858_NAME "ov8858"
#define OV8858_CHIP_ID 0x8858 #define OV8858_CHIP_ID 0x8858
#define OV8858_LONG_EXPO 0x3500 #define OV8858_LONG_EXPO 0x3500
......
drivers/staging/media/atomisp/include/media/lm3554.h
View file @ e19c9205
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
#define LM3554_NAME "lm3554"
#define LM3554_ID 3554 #define LM3554_ID 3554
#define v4l2_queryctrl_entry_integer(_id, _name,\ #define v4l2_queryctrl_entry_integer(_id, _name,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7