mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
- Fix-ups
- Convert a bunch of I2C class drivers over to .probe_new() -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmOhmzYACgkQUa+KL4f8 d2HwCw//T2WbB8K82gGV/lIJsasixahl9QRKgN9JOOTfNhKQPRiKTbnt5dsAdx5U zYzNElCeYbuL3qRKKfmlv8DVAjjqiYIbFwJc7u+NnrCWOBCPfzkukPapxO1tSWr7 kMIN0wkt1gyFwpRadx40vMuTlYpHLCVl7MIlY9yvvaO8OcfTnzghzVQVSHU7LcR3 oLat8/5xO+kPkoMP9WWgdbvqCGyd9jv7aQ51235gkEHesYtC8whIx8xsdjVTfPsF s8uiodw9l87AJ9+CfDkP5q32HUlnnAOqehHezT89N4iWTMpcYVdDjdSah4WijIxO HDVIfRJpgFtUm54mrwFWkUPzRtiPUWlO5pDi8bxb6F60LouB5cQD8/b3neNNO5+Q gveykHjPo1sM17ST2UHEz+vIuU5fZ4QtKhlaldu6vzymAd/Jt7cSnvHB+FWxPqJ1 ZK/JhiXSBOBm7CtSItma02jn2vDfTYPG65Z5zaaeUnJ2MutiWoHtoiGOrjGvIvYL xxbUgGh5CIrpjxKJoR8Btne0pB4IOloefdaRaTHM+5+8fsQZy3klsRPm+VCcQksz XczcjHUMs3SMLQj/JjO79Jv9QCz8pZzslswNNLY2ir7ROBUyY84RbcMSu06z6Sd7 ZqylRb8hWMGaWq0pg7iJ4kRYTAbFMncs27pBuTUOLO6ysisNoLE= =m+13 -----END PGP SIGNATURE----- Merge tag 'backlight-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight Pull backlight update from Lee Jones: "Convert a bunch of I2C class drivers over to .probe_new()" * tag 'backlight-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight: backlight: tosa: Convert to i2c's .probe_new() backlight: lv5207lp: Convert to i2c's .probe_new() backlight: lp855x: Convert to i2c's .probe_new() backlight: lm3639: Convert to i2c's .probe_new() backlight: lm3630a: Convert to i2c's .probe_new() backlight: bd6107: Convert to i2c's .probe_new() backlight: arcxcnn: Convert to i2c's .probe_new() backlight: adp8870: Convert to i2c's .probe_new() backlight: adp8860: Convert to i2c's .probe_new()
This commit is contained in:
commit
ec34c2b4ec
|
@ -648,9 +648,9 @@ static const struct attribute_group adp8860_bl_attr_group = {
|
|||
.attrs = adp8860_bl_attributes,
|
||||
};
|
||||
|
||||
static int adp8860_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int adp8860_probe(struct i2c_client *client)
|
||||
{
|
||||
const struct i2c_device_id *id = i2c_client_get_device_id(client);
|
||||
struct backlight_device *bl;
|
||||
struct adp8860_bl *data;
|
||||
struct adp8860_backlight_platform_data *pdata =
|
||||
|
@ -803,7 +803,7 @@ static struct i2c_driver adp8860_driver = {
|
|||
.name = KBUILD_MODNAME,
|
||||
.pm = &adp8860_i2c_pm_ops,
|
||||
},
|
||||
.probe = adp8860_probe,
|
||||
.probe_new = adp8860_probe,
|
||||
.remove = adp8860_remove,
|
||||
.id_table = adp8860_id,
|
||||
};
|
||||
|
|
|
@ -836,9 +836,9 @@ static const struct attribute_group adp8870_bl_attr_group = {
|
|||
.attrs = adp8870_bl_attributes,
|
||||
};
|
||||
|
||||
static int adp8870_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int adp8870_probe(struct i2c_client *client)
|
||||
{
|
||||
const struct i2c_device_id *id = i2c_client_get_device_id(client);
|
||||
struct backlight_properties props;
|
||||
struct backlight_device *bl;
|
||||
struct adp8870_bl *data;
|
||||
|
@ -973,7 +973,7 @@ static struct i2c_driver adp8870_driver = {
|
|||
.name = KBUILD_MODNAME,
|
||||
.pm = &adp8870_i2c_pm_ops,
|
||||
},
|
||||
.probe = adp8870_probe,
|
||||
.probe_new = adp8870_probe,
|
||||
.remove = adp8870_remove,
|
||||
.id_table = adp8870_id,
|
||||
};
|
||||
|
|
|
@ -241,7 +241,7 @@ static void arcxcnn_parse_dt(struct arcxcnn *lp)
|
|||
}
|
||||
}
|
||||
|
||||
static int arcxcnn_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
||||
static int arcxcnn_probe(struct i2c_client *cl)
|
||||
{
|
||||
struct arcxcnn *lp;
|
||||
int ret;
|
||||
|
@ -395,7 +395,7 @@ static struct i2c_driver arcxcnn_driver = {
|
|||
.name = "arcxcnn_bl",
|
||||
.of_match_table = of_match_ptr(arcxcnn_dt_ids),
|
||||
},
|
||||
.probe = arcxcnn_probe,
|
||||
.probe_new = arcxcnn_probe,
|
||||
.remove = arcxcnn_remove,
|
||||
.id_table = arcxcnn_ids,
|
||||
};
|
||||
|
|
|
@ -113,8 +113,7 @@ static const struct backlight_ops bd6107_backlight_ops = {
|
|||
.check_fb = bd6107_backlight_check_fb,
|
||||
};
|
||||
|
||||
static int bd6107_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int bd6107_probe(struct i2c_client *client)
|
||||
{
|
||||
struct bd6107_platform_data *pdata = dev_get_platdata(&client->dev);
|
||||
struct backlight_device *backlight;
|
||||
|
@ -193,7 +192,7 @@ static struct i2c_driver bd6107_driver = {
|
|||
.driver = {
|
||||
.name = "bd6107",
|
||||
},
|
||||
.probe = bd6107_probe,
|
||||
.probe_new = bd6107_probe,
|
||||
.remove = bd6107_remove,
|
||||
.id_table = bd6107_ids,
|
||||
};
|
||||
|
|
|
@ -491,8 +491,7 @@ static int lm3630a_parse_node(struct lm3630a_chip *pchip,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int lm3630a_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int lm3630a_probe(struct i2c_client *client)
|
||||
{
|
||||
struct lm3630a_platform_data *pdata = dev_get_platdata(&client->dev);
|
||||
struct lm3630a_chip *pchip;
|
||||
|
@ -617,7 +616,7 @@ static struct i2c_driver lm3630a_i2c_driver = {
|
|||
.name = LM3630A_NAME,
|
||||
.of_match_table = lm3630a_match_table,
|
||||
},
|
||||
.probe = lm3630a_probe,
|
||||
.probe_new = lm3630a_probe,
|
||||
.remove = lm3630a_remove,
|
||||
.id_table = lm3630a_id,
|
||||
};
|
||||
|
|
|
@ -296,8 +296,7 @@ static const struct regmap_config lm3639_regmap = {
|
|||
.max_register = REG_MAX,
|
||||
};
|
||||
|
||||
static int lm3639_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int lm3639_probe(struct i2c_client *client)
|
||||
{
|
||||
int ret;
|
||||
struct lm3639_chip_data *pchip;
|
||||
|
@ -412,7 +411,7 @@ static struct i2c_driver lm3639_i2c_driver = {
|
|||
.driver = {
|
||||
.name = LM3639_NAME,
|
||||
},
|
||||
.probe = lm3639_probe,
|
||||
.probe_new = lm3639_probe,
|
||||
.remove = lm3639_remove,
|
||||
.id_table = lm3639_id,
|
||||
};
|
||||
|
|
|
@ -394,8 +394,9 @@ static int lp855x_parse_acpi(struct lp855x *lp)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
||||
static int lp855x_probe(struct i2c_client *cl)
|
||||
{
|
||||
const struct i2c_device_id *id = i2c_client_get_device_id(cl);
|
||||
const struct acpi_device_id *acpi_id = NULL;
|
||||
struct device *dev = &cl->dev;
|
||||
struct lp855x *lp;
|
||||
|
@ -586,7 +587,7 @@ static struct i2c_driver lp855x_driver = {
|
|||
.of_match_table = of_match_ptr(lp855x_dt_ids),
|
||||
.acpi_match_table = ACPI_PTR(lp855x_acpi_match),
|
||||
},
|
||||
.probe = lp855x_probe,
|
||||
.probe_new = lp855x_probe,
|
||||
.remove = lp855x_remove,
|
||||
.id_table = lp855x_ids,
|
||||
};
|
||||
|
|
|
@ -76,8 +76,7 @@ static const struct backlight_ops lv5207lp_backlight_ops = {
|
|||
.check_fb = lv5207lp_backlight_check_fb,
|
||||
};
|
||||
|
||||
static int lv5207lp_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int lv5207lp_probe(struct i2c_client *client)
|
||||
{
|
||||
struct lv5207lp_platform_data *pdata = dev_get_platdata(&client->dev);
|
||||
struct backlight_device *backlight;
|
||||
|
@ -142,7 +141,7 @@ static struct i2c_driver lv5207lp_driver = {
|
|||
.driver = {
|
||||
.name = "lv5207lp",
|
||||
},
|
||||
.probe = lv5207lp_probe,
|
||||
.probe_new = lv5207lp_probe,
|
||||
.remove = lv5207lp_remove,
|
||||
.id_table = lv5207lp_ids,
|
||||
};
|
||||
|
|
|
@ -75,8 +75,7 @@ static const struct backlight_ops bl_ops = {
|
|||
.update_status = tosa_bl_update_status,
|
||||
};
|
||||
|
||||
static int tosa_bl_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int tosa_bl_probe(struct i2c_client *client)
|
||||
{
|
||||
struct backlight_properties props;
|
||||
struct tosa_bl_data *data;
|
||||
|
@ -160,7 +159,7 @@ static struct i2c_driver tosa_bl_driver = {
|
|||
.name = "tosa-bl",
|
||||
.pm = &tosa_bl_pm_ops,
|
||||
},
|
||||
.probe = tosa_bl_probe,
|
||||
.probe_new = tosa_bl_probe,
|
||||
.remove = tosa_bl_remove,
|
||||
.id_table = tosa_bl_id,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue