The patch titled atmel_lcdfb: backlight control - tiny rework has been removed from the -mm tree. Its filename was atmel_lcdfb-backlight-control-tiny-rework.patch This patch was dropped because it was folded into atmel_lcdfb-backlight-control.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: atmel_lcdfb: backlight control - tiny rework From: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> Tiny patch that removes not needed "inline" and renames function : exit_contrast() -> exit_backlight(). It adds the missing exit_backlight() in probe() error path. Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Andrew Victor <linux@xxxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/atmel_lcdfb.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff -puN drivers/video/atmel_lcdfb.c~atmel_lcdfb-backlight-control-tiny-rework drivers/video/atmel_lcdfb.c --- a/drivers/video/atmel_lcdfb.c~atmel_lcdfb-backlight-control-tiny-rework +++ a/drivers/video/atmel_lcdfb.c @@ -118,7 +118,7 @@ static struct backlight_ops atmel_lcdc_b .get_brightness = atmel_bl_get_brightness, }; -static inline void init_backlight(struct atmel_lcdfb_info *sinfo) +static void init_backlight(struct atmel_lcdfb_info *sinfo) { struct backlight_device *bl; @@ -142,7 +142,7 @@ static inline void init_backlight(struct bl->props.brightness = atmel_bl_get_brightness(bl); } -static inline void exit_contrast(struct atmel_lcdfb_info *sinfo) +static void exit_backlight(struct atmel_lcdfb_info *sinfo) { if (sinfo->backlight) backlight_device_unregister(sinfo->backlight); @@ -150,18 +150,18 @@ static inline void exit_contrast(struct #else -static inline void init_backlight(struct atmel_lcdfb_info *sinfo) +static void init_backlight(struct atmel_lcdfb_info *sinfo) { dev_warn(&sinfo->pdev->dev, "backlight control is not available\n"); } -static inline void exit_contrast(struct atmel_lcdfb_info *sinfo) +static void exit_backlight(struct atmel_lcdfb_info *sinfo) { } #endif -static inline void init_contrast(struct atmel_lcdfb_info *sinfo) +static void init_contrast(struct atmel_lcdfb_info *sinfo) { /* have some default contrast/backlight settings */ lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr); @@ -843,6 +843,7 @@ free_cmap: unregister_irqs: free_irq(sinfo->irq_base, info); unmap_mmio: + exit_backlight(sinfo); iounmap(sinfo->mmio); release_mem: release_mem_region(info->fix.mmio_start, info->fix.mmio_len); @@ -877,7 +878,7 @@ static int __exit atmel_lcdfb_remove(str if (!sinfo) return 0; - exit_contrast(sinfo); + exit_backlight(sinfo); if (sinfo->atmel_lcdfb_power_control) sinfo->atmel_lcdfb_power_control(0); unregister_framebuffer(info); _ Patches currently in -mm which might be from nicolas.ferre@xxxxxxxxx are origin.patch atmel_lcdfb-backlight-control.patch atmel_lcdfb-backlight-control-tiny-rework.patch basic-pwm-driver-for-avr32-and-at91.patch basic-pwm-driver-for-avr32-and-at91-fix.patch pwm-led-driver.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