From d552e0f4f754b2c730708f9cd05978ce6b660382 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 20 Jan 2011 19:00:01 -0800 Subject: [PATCH] siihdmi: minor cleanup of siihdmi_fb_event_handler Add more const to the function. Just always allocate the fb_var_screeninfo. Inline the event data conversion. --- drivers/video/mxc/mxcfb_siihdmi.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/video/mxc/mxcfb_siihdmi.c b/drivers/video/mxc/mxcfb_siihdmi.c index ea61146383c..a26fcc59ca2 100644 --- a/drivers/video/mxc/mxcfb_siihdmi.c +++ b/drivers/video/mxc/mxcfb_siihdmi.c @@ -843,8 +843,9 @@ static int siihdmi_fb_event_handler(struct notifier_block *nb, unsigned long val, void *v) { - struct fb_event *event = v; - struct siihdmi_tx *tx = container_of(nb, struct siihdmi_tx, nb); + const struct fb_event * const event = v; + struct siihdmi_tx * const tx = container_of(nb, struct siihdmi_tx, nb); + struct fb_var_screeninfo var = {0}; switch (val) { case FB_EVENT_FB_REGISTERED: @@ -853,23 +854,15 @@ static int siihdmi_fb_event_handler(struct notifier_block *nb, #endif return siihdmi_init_fb(tx, event->info); case FB_EVENT_MODE_CHANGE: - { - struct fb_var_screeninfo var = {0}; - fb_videomode_to_var(&var, event->info->mode); #if defined(CONFIG_MACH_MX51_EFIKAMX) msleep(MX51_IPU_SETTLE_TIME_MS); #endif return siihdmi_set_resolution(tx, &var); - } - break; case FB_EVENT_BLANK: - { - struct fb_var_screeninfo var = {0}; - int event_type = *((int *)event->data); fb_videomode_to_var(&var, event->info->mode); - switch (event_type) { + switch (*((int *) event->data)) { case FB_BLANK_POWERDOWN: return siihdmi_blank(tx, &var, 1); case FB_BLANK_VSYNC_SUSPEND: @@ -879,8 +872,8 @@ static int siihdmi_fb_event_handler(struct notifier_block *nb, case FB_BLANK_UNBLANK: return siihdmi_unblank(tx, &var); } - } - break; + + break; default: DEBUG("unhandled fb event 0x%lx", val); break;