Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+21
-25
+3
-3
drivers/video/backlight/adp8860_bl.c
+3
-3
drivers/video/backlight/adp8860_bl.c
···
648
648
.attrs = adp8860_bl_attributes,
649
649
};
650
650
651
-
static int adp8860_probe(struct i2c_client *client,
652
-
const struct i2c_device_id *id)
651
+
static int adp8860_probe(struct i2c_client *client)
653
652
{
653
+
const struct i2c_device_id *id = i2c_client_get_device_id(client);
654
654
struct backlight_device *bl;
655
655
struct adp8860_bl *data;
656
656
struct adp8860_backlight_platform_data *pdata =
···
803
803
.name = KBUILD_MODNAME,
804
804
.pm = &adp8860_i2c_pm_ops,
805
805
},
806
-
.probe = adp8860_probe,
806
+
.probe_new = adp8860_probe,
807
807
.remove = adp8860_remove,
808
808
.id_table = adp8860_id,
809
809
};
+3
-3
drivers/video/backlight/adp8870_bl.c
+3
-3
drivers/video/backlight/adp8870_bl.c
···
836
836
.attrs = adp8870_bl_attributes,
837
837
};
838
838
839
-
static int adp8870_probe(struct i2c_client *client,
840
-
const struct i2c_device_id *id)
839
+
static int adp8870_probe(struct i2c_client *client)
841
840
{
841
+
const struct i2c_device_id *id = i2c_client_get_device_id(client);
842
842
struct backlight_properties props;
843
843
struct backlight_device *bl;
844
844
struct adp8870_bl *data;
···
973
973
.name = KBUILD_MODNAME,
974
974
.pm = &adp8870_i2c_pm_ops,
975
975
},
976
-
.probe = adp8870_probe,
976
+
.probe_new = adp8870_probe,
977
977
.remove = adp8870_remove,
978
978
.id_table = adp8870_id,
979
979
};
+2
-2
drivers/video/backlight/arcxcnn_bl.c
+2
-2
drivers/video/backlight/arcxcnn_bl.c
···
241
241
}
242
242
}
243
243
244
-
static int arcxcnn_probe(struct i2c_client *cl, const struct i2c_device_id *id)
244
+
static int arcxcnn_probe(struct i2c_client *cl)
245
245
{
246
246
struct arcxcnn *lp;
247
247
int ret;
···
395
395
.name = "arcxcnn_bl",
396
396
.of_match_table = of_match_ptr(arcxcnn_dt_ids),
397
397
},
398
-
.probe = arcxcnn_probe,
398
+
.probe_new = arcxcnn_probe,
399
399
.remove = arcxcnn_remove,
400
400
.id_table = arcxcnn_ids,
401
401
};
+2
-3
drivers/video/backlight/bd6107.c
+2
-3
drivers/video/backlight/bd6107.c
···
113
113
.check_fb = bd6107_backlight_check_fb,
114
114
};
115
115
116
-
static int bd6107_probe(struct i2c_client *client,
117
-
const struct i2c_device_id *id)
116
+
static int bd6107_probe(struct i2c_client *client)
118
117
{
119
118
struct bd6107_platform_data *pdata = dev_get_platdata(&client->dev);
120
119
struct backlight_device *backlight;
···
192
193
.driver = {
193
194
.name = "bd6107",
194
195
},
195
-
.probe = bd6107_probe,
196
+
.probe_new = bd6107_probe,
196
197
.remove = bd6107_remove,
197
198
.id_table = bd6107_ids,
198
199
};
+2
-3
drivers/video/backlight/lm3630a_bl.c
+2
-3
drivers/video/backlight/lm3630a_bl.c
···
491
491
return ret;
492
492
}
493
493
494
-
static int lm3630a_probe(struct i2c_client *client,
495
-
const struct i2c_device_id *id)
494
+
static int lm3630a_probe(struct i2c_client *client)
496
495
{
497
496
struct lm3630a_platform_data *pdata = dev_get_platdata(&client->dev);
498
497
struct lm3630a_chip *pchip;
···
616
617
.name = LM3630A_NAME,
617
618
.of_match_table = lm3630a_match_table,
618
619
},
619
-
.probe = lm3630a_probe,
620
+
.probe_new = lm3630a_probe,
620
621
.remove = lm3630a_remove,
621
622
.id_table = lm3630a_id,
622
623
};
+2
-3
drivers/video/backlight/lm3639_bl.c
+2
-3
drivers/video/backlight/lm3639_bl.c
···
296
296
.max_register = REG_MAX,
297
297
};
298
298
299
-
static int lm3639_probe(struct i2c_client *client,
300
-
const struct i2c_device_id *id)
299
+
static int lm3639_probe(struct i2c_client *client)
301
300
{
302
301
int ret;
303
302
struct lm3639_chip_data *pchip;
···
411
412
.driver = {
412
413
.name = LM3639_NAME,
413
414
},
414
-
.probe = lm3639_probe,
415
+
.probe_new = lm3639_probe,
415
416
.remove = lm3639_remove,
416
417
.id_table = lm3639_id,
417
418
};
+3
-2
drivers/video/backlight/lp855x_bl.c
+3
-2
drivers/video/backlight/lp855x_bl.c
···
394
394
return 0;
395
395
}
396
396
397
-
static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
397
+
static int lp855x_probe(struct i2c_client *cl)
398
398
{
399
+
const struct i2c_device_id *id = i2c_client_get_device_id(cl);
399
400
const struct acpi_device_id *acpi_id = NULL;
400
401
struct device *dev = &cl->dev;
401
402
struct lp855x *lp;
···
587
586
.of_match_table = of_match_ptr(lp855x_dt_ids),
588
587
.acpi_match_table = ACPI_PTR(lp855x_acpi_match),
589
588
},
590
-
.probe = lp855x_probe,
589
+
.probe_new = lp855x_probe,
591
590
.remove = lp855x_remove,
592
591
.id_table = lp855x_ids,
593
592
};
+2
-3
drivers/video/backlight/lv5207lp.c
+2
-3
drivers/video/backlight/lv5207lp.c
···
76
76
.check_fb = lv5207lp_backlight_check_fb,
77
77
};
78
78
79
-
static int lv5207lp_probe(struct i2c_client *client,
80
-
const struct i2c_device_id *id)
79
+
static int lv5207lp_probe(struct i2c_client *client)
81
80
{
82
81
struct lv5207lp_platform_data *pdata = dev_get_platdata(&client->dev);
83
82
struct backlight_device *backlight;
···
141
142
.driver = {
142
143
.name = "lv5207lp",
143
144
},
144
-
.probe = lv5207lp_probe,
145
+
.probe_new = lv5207lp_probe,
145
146
.remove = lv5207lp_remove,
146
147
.id_table = lv5207lp_ids,
147
148
};
+2
-3
drivers/video/backlight/tosa_bl.c
+2
-3
drivers/video/backlight/tosa_bl.c
···
75
75
.update_status = tosa_bl_update_status,
76
76
};
77
77
78
-
static int tosa_bl_probe(struct i2c_client *client,
79
-
const struct i2c_device_id *id)
78
+
static int tosa_bl_probe(struct i2c_client *client)
80
79
{
81
80
struct backlight_properties props;
82
81
struct tosa_bl_data *data;
···
159
160
.name = "tosa-bl",
160
161
.pm = &tosa_bl_pm_ops,
161
162
},
162
-
.probe = tosa_bl_probe,
163
+
.probe_new = tosa_bl_probe,
163
164
.remove = tosa_bl_remove,
164
165
.id_table = tosa_bl_id,
165
166
};