diff options
| author | Andy Green <andy.green@linaro.org> | 2011-08-25 08:02:27 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-08-25 08:02:27 +0100 |
| commit | ee120654086ff9874a6c423d1116699b56670e28 (patch) | |
| tree | 7afdc9eb647cb821e2bab421598e3f4cd5b92302 | |
| parent | bafbb3a60bc7de890990d4045a9741f4b56334d9 (diff) | |
SGX adapt console sem to console_lock
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c index 3434d049424..c27807648ba 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c @@ -294,14 +294,14 @@ static OMAP_ERROR UnBlankDisplay(OMAPLFB_DEVINFO *psDevInfo) DEBUG_PRINTK("Executing for display %u", psDevInfo->uDeviceID); - acquire_console_sem(); + console_lock(); if (fb_blank(psDevInfo->psLINFBInfo, FB_BLANK_UNBLANK)) { - release_console_sem(); + console_unlock(); WARNING_PRINTK("fb_blank failed"); return OMAP_ERROR_GENERIC; } - release_console_sem(); + console_unlock(); return OMAP_OK; } @@ -1257,7 +1257,7 @@ static void DeInitDev(OMAPLFB_DEVINFO *psDevInfo) struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo; struct module *psLINFBOwner; - acquire_console_sem(); + console_lock(); psLINFBOwner = psLINFBInfo->fbops->owner; if (psLINFBInfo->fbops->fb_release != NULL) @@ -1265,7 +1265,7 @@ static void DeInitDev(OMAPLFB_DEVINFO *psDevInfo) module_put(psLINFBOwner); - release_console_sem(); + console_unlock(); } /* @@ -1384,7 +1384,7 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINFO *psDevInfo, int fb_idx) WARNING_PRINTK("Unknown bits per pixel format %i", DESIRED_BPP); } - acquire_console_sem(); + console_lock(); FBSize = (psLINFBInfo->screen_size) != 0 ? psLINFBInfo->screen_size : psLINFBInfo->fix.smem_len; @@ -1430,7 +1430,7 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINFO *psDevInfo, int fb_idx) if (!try_module_get(psLINFBOwner)) { ERROR_PRINTK("Couldn't get framebuffer module"); - release_console_sem(); + console_unlock(); return OMAP_ERROR_GENERIC; } @@ -1441,7 +1441,7 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINFO *psDevInfo, int fb_idx) ERROR_PRINTK("Couldn't open framebuffer with" " index %d", fb_idx); module_put(psLINFBOwner); - release_console_sem(); + console_unlock(); return OMAP_ERROR_GENERIC; } } @@ -1544,7 +1544,7 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINFO *psDevInfo, int fb_idx) else WARNING_PRINTK("*Format: Unknown framebuffer format"); - release_console_sem(); + console_unlock(); return OMAP_OK; } |