• Stephen Rothwell's avatar
    [media] media: remove __dev* annotations · 3151d14a
    Stephen Rothwell authored
    Hi Mauro,
    After merging the v4l-dvb tree, today's linux-next build (x86_64
    allmodconfig) failed like this:
    drivers/media/platform/sh_veu.c:1146:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_probe'
    drivers/media/platform/sh_veu.c:1228:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_remove'
    drivers/media/platform/sh_veu.c:1244:2: error: implicit declaration of function '__devexit_p' [-Werror=implicit-function-declaration]
    drivers/media/platform/sh_veu.c:1244:25: error: 'sh_veu_remove' undeclared here (not in a function)
    drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
    drivers/media/platform/sh_veu.c:1253:45: error: 'sh_veu_probe' undeclared (first use in this function)
    drivers/media/platform/sh_veu.c:1253:45: note: each undeclared identifier is reported only once for each function it appears in
    drivers/media/platform/sh_veu.c: At top level:
    drivers/media/platform/sh_veu.c:1095:20: warning: 'sh_veu_bh' defined but not used [-Wunused-function]
    drivers/media/platform/sh_veu.c:1109:20: warning: 'sh_veu_isr' defined but not used [-Wunused-function]
    drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
    drivers/media/platform/sh_veu.c:1254:1: warning: control reaches end of non-void function [-Wreturn-type]
    Caused by commit 05efa71b ("[media] media: add a VEU MEM2MEM format
    conversion and scaling driver") interacting with commit 54b956b9
    ("Remove __dev* markings from init.h") from the driver-core.current tree.
    I have applied the following merge fix patch which could be applied
    directly to the v4l-dvb tree (please):
    CONFIG_HOTPLUG is always true now and the __dev* macros have meen removed.
    
    Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
    3151d14a
sh_veu.c 32.3 KB