Subject: [merged] drivers-video-backlight-tosa_lcdc-remove-redundant-spi_set_drvdata.patch removed from -mm tree
To: sachin.kamat@xxxxxxxxxx,jg1.han@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 30 Sep 2013 11:57:38 -0700
The patch titled
Subject: drivers/video/backlight/tosa_lcd.c: remove redundant spi_set_drvdata
has been removed from the -mm tree. Its filename was
drivers-video-backlight-tosa_lcdc-remove-redundant-spi_set_drvdata.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Subject: drivers/video/backlight/tosa_lcd.c: remove redundant spi_set_drvdata
Driver core sets driver data to NULL upon failure or remove.
Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Acked-by: Jingoo Han <jg1.han@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/backlight/tosa_lcd.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN drivers/video/backlight/tosa_lcd.c~drivers-video-backlight-tosa_lcdc-remove-redundant-spi_set_drvdata drivers/video/backlight/tosa_lcd.c
--- a/drivers/video/backlight/tosa_lcd.c~drivers-video-backlight-tosa_lcdc-remove-redundant-spi_set_drvdata
+++ a/drivers/video/backlight/tosa_lcd.c
@@ -198,7 +198,7 @@ static int tosa_lcd_probe(struct spi_dev
ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
GPIOF_OUT_INIT_LOW, "tg #pwr");
if (ret < 0)
- goto err_gpio_tg;
+ return ret;
mdelay(60);
@@ -219,8 +219,6 @@ static int tosa_lcd_probe(struct spi_dev
err_register:
tosa_lcd_tg_off(data);
-err_gpio_tg:
- spi_set_drvdata(spi, NULL);
return ret;
}
@@ -235,8 +233,6 @@ static int tosa_lcd_remove(struct spi_de
tosa_lcd_tg_off(data);
- spi_set_drvdata(spi, NULL);
-
return 0;
}
_
Patches currently in -mm which might be from sachin.kamat@xxxxxxxxxx are
linux-next.patch
drivers-rtc-rtc-ds1307c-release-irq-on-error.patch
drivers-rtc-rtc-isl1208c-remove-redundant-checks.patch
drivers-rtc-rtc-max6900c-remove-redundant-checks.patch
drivers-rtc-rtc-vt8500c-fix-return-value.patch
drivers-rtc-rtc-at91rm9200c-use-devm_-apis.patch
drivers-rtc-rtc-isl1208c-use-devm_-apis.patch
drivers-rtc-rtc-sirfsocc-use-devm_rtc_device_register.patch
drivers-rtc-rtc-cmosc-remove-redundant-dev_set_drvdata.patch
drivers-rtc-rtc-mrstc-remove-redundant-dev_set_drvdata.patch
drivers-rtc-rtc-vr41xxc-fix-checkpatch-warnings.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
