Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e0b7fe3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight 

Pull backlight driver updates from Lee Jones:
 "Changes to existing drivers:
   - Checkpatch fixes
   - Removal of unused code in generic_bl
   - Removal of superfluous .owner attribute

  No new or removed drivers/supported devices"

* tag 'backlight-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: omap1: add blank line after declarations
  backlight: jornada720: Remove 'else' after a return
  backlight: jornada720: Remove 'else' after a return
  backlight: wm831x_bl: Add blank line after declarations
  backlight: tdo24m: Add blank line after declarations
  backlight: s6e63m0: Remove 'else' after a return
  backlight: pcf50633: Add blank line after declarations
  backlight: lp855x: Add blank line after declarations
  backlight: lms501kf03: Remove 'else' after a return
  backlight: lm3639: Remove unnecessary return statements
  backlight: ld9040: Remove 'else' after a return
  backlight: ili922x: Remove 'else' after a return
  backlight: cr_bllcd: Add blank line after declarations
  backlight: corgi_lcd: Add blank line after declarations
  backlight: ams369fg06: Remove 'else' after a return
  backlight: adp8870: Add blank line after declarations
  backlight: adp8860: Add blank line after declarations
  backlight: adp5520: Add blank line after declarations
  backlight: generic_bl: Remove unused function
  backlight: Remove .owner field for drivers using module_platform_driver
parents f43b179b b6af73b4

drivers/video/backlight/88pm860x_bl.c

+0 −1
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev) 
static struct platform_driver pm860x_backlight_driver = {

	.driver		= {

		.name	= "88pm860x-backlight",

		.owner	= THIS_MODULE,

	},

	.probe		= pm860x_backlight_probe,

};

drivers/video/backlight/aat2870_bl.c

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static int aat2870_bl_remove(struct platform_device *pdev) 
static struct platform_driver aat2870_bl_driver = {

	.driver = {

		.name	= "aat2870-backlight",

		.owner	= THIS_MODULE,

	},

	.probe		= aat2870_bl_probe,

	.remove		= aat2870_bl_remove,

drivers/video/backlight/adp5520_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static int adp5520_bl_set(struct backlight_device *bl, int brightness) 
static int adp5520_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;
@@ -374,7 +375,6 @@ static SIMPLE_DEV_PM_OPS(adp5520_bl_pm_ops, adp5520_bl_suspend, 
static struct platform_driver adp5520_bl_driver = {

	.driver		= {

		.name	= "adp5520-backlight",

		.owner	= THIS_MODULE,

		.pm	= &adp5520_bl_pm_ops,

	},

	.probe		= adp5520_bl_probe,

drivers/video/backlight/adp8860_bl.c

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ static int adp8860_clr_bits(struct i2c_client *client, int reg, uint8_t bit_mask 
static void adp8860_led_work(struct work_struct *work)

{

	struct adp8860_led *led = container_of(work, struct adp8860_led, work);



	adp8860_write(led->client, ADP8860_ISC1 - led->id + 1,

			 led->new_brightness >> 1);

}
@@ -362,6 +363,7 @@ static int adp8860_bl_set(struct backlight_device *bl, int brightness) 
static int adp8860_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;
@@ -499,6 +501,7 @@ static ssize_t adp8860_bl_l1_daylight_max_store(struct device *dev, 
{

	struct adp8860_bl *data = dev_get_drvdata(dev);

	int ret = kstrtoul(buf, 10, &data->cached_daylight_max);



	if (ret)

		return ret;

drivers/video/backlight/adp8870_bl.c

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static int adp8870_read(struct i2c_client *client, int reg, uint8_t *val) 
static int adp8870_write(struct i2c_client *client, u8 reg, u8 val)

{

	int ret = i2c_smbus_write_byte_data(client, reg, val);



	if (ret)

		dev_err(&client->dev, "failed to write\n");
@@ -195,6 +196,7 @@ static int adp8870_clr_bits(struct i2c_client *client, int reg, uint8_t bit_mask 
static void adp8870_led_work(struct work_struct *work)

{

	struct adp8870_led *led = container_of(work, struct adp8870_led, work);



	adp8870_write(led->client, ADP8870_ISC1 + led->id - 1,

			 led->new_brightness >> 1);

}
@@ -399,6 +401,7 @@ static int adp8870_bl_set(struct backlight_device *bl, int brightness) 
static int adp8870_bl_update_status(struct backlight_device *bl)

{

	int brightness = bl->props.brightness;



	if (bl->props.power != FB_BLANK_UNBLANK)

		brightness = 0;
@@ -649,6 +652,7 @@ static ssize_t adp8870_bl_l1_daylight_max_store(struct device *dev, 
{

	struct adp8870_bl *data = dev_get_drvdata(dev);

	int ret = kstrtoul(buf, 10, &data->cached_daylight_max);



	if (ret)

		return ret;