Commit 3151d14a authored Jan 10, 2013 by Stephen Rothwell Committed by Mauro Carvalho Chehab Jan 11, 2013

[media] media: remove __dev* annotations

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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 978ae224

drivers/media/platform/sh_veu.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1143,7 +1143,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

	static int __devinit sh_veu_probe(struct platform_device *pdev)		static int sh_veu_probe(struct platform_device *pdev)
	{		{
	struct sh_veu_dev *veu;		struct sh_veu_dev *veu;
	struct resource *reg_res;		struct resource *reg_res;
	@@ -1225,7 +1225,7 @@ einitctx:
	return ret;		return ret;
	}		}

	static int __devexit sh_veu_remove(struct platform_device *pdev)		static int sh_veu_remove(struct platform_device *pdev)
	{		{
	struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);		struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
	struct sh_veu_dev *veu = container_of(v4l2_dev,		struct sh_veu_dev *veu = container_of(v4l2_dev,
	@@ -1241,7 +1241,7 @@ static int __devexit sh_veu_remove(struct platform_device *pdev)
	}		}

	static struct platform_driver __refdata sh_veu_pdrv = {		static struct platform_driver __refdata sh_veu_pdrv = {
	.remove = __devexit_p(sh_veu_remove),		.remove = sh_veu_remove,
	.driver = {		.driver = {
	.name = "sh_veu",		.name = "sh_veu",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,