The patch titled drivers/video/aty: Clean up return paths in aty_bl_init() has been removed from the -mm tree. Its filename is drivers-video-aty-clean-up-return-paths-in-aty_bl_init.patch This patch was dropped because multiple return statments in a function reduce maintainability ------------------------------------------------------ Subject: drivers/video/aty: Clean up return paths in aty_bl_init() From: Tobias Klauser <tklauser@xxxxxxxxxxx> This patch also adds appropriate KERN_* constants to printk() calls in aty_bl_init() Signed-off-by: Tobias Klauser <tklauser@xxxxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/video/aty/atyfb_base.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/video/aty/atyfb_base.c~drivers-video-aty-clean-up-return-paths-in-aty_bl_init drivers/video/aty/atyfb_base.c --- a/drivers/video/aty/atyfb_base.c~drivers-video-aty-clean-up-return-paths-in-aty_bl_init +++ a/drivers/video/aty/atyfb_base.c @@ -2201,8 +2201,8 @@ static void aty_bl_init(struct atyfb_par bd = backlight_device_register(name, par, &aty_bl_data); if (IS_ERR(bd)) { info->bl_dev = NULL; - printk("aty: Backlight registration failed\n"); - goto error; + printk(KERN_ERR "aty: Backlight registration failed\n"); + return; } mutex_lock(&info->bl_mutex); @@ -2225,12 +2225,9 @@ static void aty_bl_init(struct atyfb_par mutex_unlock(&pmac_backlight_mutex); #endif - printk("aty: Backlight initialized (%s)\n", name); + printk(KERN_INFO "aty: Backlight initialized (%s)\n", name); return; - -error: - return; } static void aty_bl_exit(struct atyfb_par *par) _ Patches currently in -mm which might be from tklauser@xxxxxxxxxxx are origin.patch drivers-video-aty-clean-up-return-paths-in-aty_bl_init.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