Subject: + backlight-as3711_bl-use-devm_backlight_device_register.patch added to -mm tree To: jg1.han@xxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 24 Sep 2013 16:12:08 -0700 The patch titled Subject: backlight: as3711_bl: use devm_backlight_device_register() has been added to the -mm tree. Its filename is backlight-as3711_bl-use-devm_backlight_device_register.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/backlight-as3711_bl-use-devm_backlight_device_register.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/backlight-as3711_bl-use-devm_backlight_device_register.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: backlight: as3711_bl: use devm_backlight_device_register() Use devm_backlight_device_register() to make cleanup paths simpler, and remove unnecessary remove(). Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/as3711_bl.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff -puN drivers/video/backlight/as3711_bl.c~backlight-as3711_bl-use-devm_backlight_device_register drivers/video/backlight/as3711_bl.c --- a/drivers/video/backlight/as3711_bl.c~backlight-as3711_bl-use-devm_backlight_device_register +++ a/drivers/video/backlight/as3711_bl.c @@ -240,7 +240,8 @@ static int as3711_bl_register(struct pla /* max tuning I = 31uA for voltage- and 38250uA for current-feedback */ props.max_brightness = max_brightness; - bl = backlight_device_register(su->type == AS3711_BL_SU1 ? + bl = devm_backlight_device_register(&pdev->dev, + su->type == AS3711_BL_SU1 ? "as3711-su1" : "as3711-su2", &pdev->dev, su, &as3711_bl_ops, &props); @@ -432,8 +433,7 @@ static int as3711_backlight_probe(struct case AS3711_SU2_LX_SD4: break; default: - ret = -EINVAL; - goto esu2; + return -EINVAL; } switch (pdata->su2_feedback) { @@ -447,8 +447,7 @@ static int as3711_backlight_probe(struct max_brightness = min(pdata->su2_max_uA / 150, 255); break; default: - ret = -EINVAL; - goto esu2; + return -EINVAL; } ret = as3711_bl_init_su2(supply); @@ -457,26 +456,12 @@ static int as3711_backlight_probe(struct ret = as3711_bl_register(pdev, max_brightness, su); if (ret < 0) - goto esu2; + return ret; } platform_set_drvdata(pdev, supply); return 0; - -esu2: - backlight_device_unregister(supply->su1.bl); - return ret; -} - -static int as3711_backlight_remove(struct platform_device *pdev) -{ - struct as3711_bl_supply *supply = platform_get_drvdata(pdev); - - backlight_device_unregister(supply->su1.bl); - backlight_device_unregister(supply->su2.bl); - - return 0; } static struct platform_driver as3711_backlight_driver = { @@ -485,7 +470,6 @@ static struct platform_driver as3711_bac .owner = THIS_MODULE, }, .probe = as3711_backlight_probe, - .remove = as3711_backlight_remove, }; module_platform_driver(as3711_backlight_driver); _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are drivers-iommu-omap-iopgtableh-remove-unneeded-cast-of-void.patch backlight-lp855x_bl-support-new-lp8555-device.patch backlight-lm3630-apply-chip-revision.patch backlight-ld9040-staticize-local-variable-gamma_table.patch backlight-lm3639-dont-mix-different-enum-types.patch backlight-lp8788-staticize-default_bl_config.patch backlight-use-dev_get_platdata.patch backlight-88pm860x_bl-use-devm_backlight_device_register.patch backlight-aat2870-use-devm_backlight_device_register.patch backlight-adp5520-use-devm_backlight_device_register.patch backlight-adp8860-use-devm_backlight_device_register.patch backlight-adp8870-use-devm_backlight_device_register.patch backlight-as3711_bl-use-devm_backlight_device_register.patch backlight-atmel-pwm-bl-use-devm_backlight_device_register.patch backlight-bd6107-use-devm_backlight_device_register.patch backlight-da903x_bl-use-devm_backlight_device_register.patch backlight-da9052_bl-use-devm_backlight_device_register.patch backlight-ep93xx-use-devm_backlight_device_register.patch backlight-generic_bl-use-devm_backlight_device_register.patch backlight-gpio_backlight-use-devm_backlight_device_register.patch backlight-kb3886_bl-use-devm_backlight_device_register.patch backlight-lm3533_bl-use-devm_backlight_device_register.patch backlight-lp855x-use-devm_backlight_device_register.patch backlight-lv5207lp-use-devm_backlight_device_register.patch backlight-max8925_bl-use-devm_backlight_device_register.patch backlight-pandora_bl-use-devm_backlight_device_register.patch backlight-pcf50633-use-devm_backlight_device_register.patch backlight-tps65217_bl-use-devm_backlight_device_register.patch backlight-wm831x_bl-use-devm_backlight_device_register.patch backlight-hx8357-use-devm_lcd_device_register.patch backlight-ili922x-use-devm_lcd_device_register.patch backlight-ili9320-use-devm_lcd_device_register.patch backlight-lms283gf05-use-devm_lcd_device_register.patch backlight-lms501kf03-use-devm_lcd_device_register.patch backlight-ltv350qv-use-devm_lcd_device_register.patch backlight-platform_lcd-use-devm_lcd_device_register.patch backlight-tdo24m-use-devm_lcd_device_register.patch backlight-ams369fg06-use-devm_backlightlcd_device_register.patch backlight-ld9040-use-devm_backlightlcd_device_register.patch backlight-corgi_lcd-use-devm_backlightlcd_device_register.patch backlight-cr_bllcd-use-devm_backlightlcd_device_register.patch backlight-s6e63m0-use-devm_backlightlcd_device_register.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 drivers-rtc-rtc-sirfsocc-remove-unneeded-casts-of-void.patch drivers-char-xilinx_hwicap-xilinx_hwicapc-remove-unneeded-cast-of-void.patch w1-w1-gpio-use-dev_get_platdata.patch w1-ds1wm-use-dev_get_platdata.patch linux-next.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