Commit ec34c2b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 7406fd75 0de796b6

drivers/video/backlight/adp8860_bl.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/backlight/adp8870_bl.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/backlight/arcxcnn_bl.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/backlight/bd6107.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

};

drivers/video/backlight/lm3630a_bl.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

};