hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm, fbdev, omap2, LLVMLinux: Remove nested function from omap2 dss 

Replace the use of nested functions where a normal function will suffice.

Nested functions are not liked by upstream kernel developers in general. Their
use breaks the use of clang as a compiler, and doesn't make the code any
better.

This code now works for both gcc and clang.

Signed-off-by: Behan Webster <behanw@converseincode.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Behan Webster 2014-09-26 18:10:52 -07:00 committed by Tomi Valkeinen
parent 8251434bb4
commit 032e57f01b
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/fbdev/omap2/dss/dispc-compat.c
View File

@ -634,13 +634,14 @@ void dispc_mgr_disable_sync(enum omap_channel channel)
WARN_ON(1); WARN_ON(1);
} }
static inline void dispc_irq_wait_handler(void *data, u32 mask)
{
complete((struct completion *)data);
}
int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask, int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
unsigned long timeout) unsigned long timeout)
{ {
void dispc_irq_wait_handler(void *data, u32 mask)
{
complete((struct completion *)data);
}
int r; int r;
DECLARE_COMPLETION_ONSTACK(completion); DECLARE_COMPLETION_ONSTACK(completion);

16
drivers/video/fbdev/omap2/dss/manager-sysfs.c
View File

@ -44,6 +44,13 @@ static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
dssdev->name : "<none>"); dssdev->name : "<none>");
} }
static int manager_display_match(struct omap_dss_device *dssdev, void *data)
{
const char *str = data;
return sysfs_streq(dssdev->name, str);
}
static ssize_t manager_display_store(struct omap_overlay_manager *mgr, static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
const char *buf, size_t size) const char *buf, size_t size)
{ {
@ -52,17 +59,12 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
struct omap_dss_device *dssdev = NULL; struct omap_dss_device *dssdev = NULL;
struct omap_dss_device *old_dssdev; struct omap_dss_device *old_dssdev;
int match(struct omap_dss_device *dssdev, void *data)
{
const char *str = data;
return sysfs_streq(dssdev->name, str);
}
if (buf[size-1] == '\n') if (buf[size-1] == '\n')
--len; --len;
if (len > 0) if (len > 0)
dssdev = omap_dss_find_device((void *)buf, match); dssdev = omap_dss_find_device((void *)buf,
manager_display_match);
if (len > 0 && dssdev == NULL) if (len > 0 && dssdev == NULL)
return -EINVAL; return -EINVAL;