arm/omap2: Fix build failures
Subsystems (3)
PATCH 1/1 arm/omap2: Fix build failures
Commit c1d1cd59 (omap_device: remove obsolete pm_lats and early_device code) changed the number of parameters to omap_device_build(), but did not fix all calling code correctly. This causes build failures with some configurations.
arch/arm/mach-omap2/devices.c: In function 'omap_init_hdmi_audio':arch/arm/mach-omap2/devices.c:429:2: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
make[2]: [arch/arm/mach-omap2/devices.o] Error 1 (ignored) arch/arm/mach-omap2/sr_device.c: In function 'sr_dev_init':arch/arm/mach-omap2/sr_device.c:155:2: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
make[2]: [arch/arm/mach-omap2/sr_device.o] Error 1 (ignored) arch/arm/mach-omap2/am35xx-emac.c: In function 'omap_davinci_emac_dev_init':arch/arm/mach-omap2/am35xx-emac.c:66:6: error: too many arguments to function 'omap_device_build' arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
--- arch/arm/mach-omap2/am35xx-emac.c | 3 +-- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/sr_device.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/am35xx-emac.c +1 -2
@@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, {struct platform_device *pdev; - pdev =omap_device_build (oh->class->name,0 , oh, pdata, pdata_len, - false); + pdev =omap_device_build (oh->class->name,0 , oh, pdata, pdata_len);if (IS_ERR (pdev)) {WARN (1 ,"Can't build omap_device for %s:%s.\n" , oh->class->name, oh->name);
arch/arm/mach-omap2/devices.c +1 -1
@@ -426,7 +426,7 @@ static void __init omap_init_hdmi_audio(void)return ; } - pdev =omap_device_build ("omap-hdmi-audio-dai" ,-1 , oh,NULL ,0 ,0 ); + pdev =omap_device_build ("omap-hdmi-audio-dai" ,-1 , oh,NULL ,0 );WARN (IS_ERR (pdev),"Can't build omap_device for omap-hdmi-audio-dai.\n" );
arch/arm/mach-omap2/sr_device.c +1 -1
@@ -152,7 +152,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) sr_data->enable_on_init = sr_enable_on_init; - pdev =omap_device_build (name, i, oh, sr_data,sizeof (*sr_data),0 ); + pdev =omap_device_build (name, i, oh, sr_data,sizeof (*sr_data));if (IS_ERR (pdev))pr_warning ("%s: Could not build omap_device for %s: %s.\n\n" , __func__, name, oh->name);
Signature · 1 line
1.7.9.7
Tony Lindgren
maintainerPATCH 1/1 arm/omap2: Fix build failures
Hi,
Quoted 4 lines · Guenter Roeck
Commit
c1d1cd59(omap_device: remove obsoletepm_latsandearly_devicecode) changed the number of parameters toomap_device_build(), but did not fix all calling code correctly. This causes build failures with some configurations.
Quoted 11 lines
arch/arm/mach-omap2/devices.c: In function 'omap_init_hdmi_audio':arch/arm/mach-omap2/devices.c:429:2: error: too many arguments to function 'omap_device_build'arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
make[2]: [arch/arm/mach-omap2/devices.o] Error 1 (ignored)arch/arm/mach-omap2/sr_device.c: In function 'sr_dev_init':arch/arm/mach-omap2/sr_device.c:155:2: error: too many arguments to function 'omap_device_build'arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
make[2]: [arch/arm/mach-omap2/sr_device.o] Error 1 (ignored)arch/arm/mach-omap2/am35xx-emac.c: In function 'omap_davinci_emac_dev_init':arch/arm/mach-omap2/am35xx-emac.c:66:6: error: too many arguments to function 'omap_device_build'arch/arm/mach-omap2/omap_device.h:74:25: note: declared here
Thanks, we already have a fix for this in linux next as commit 6efc3fe0 (ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default). It seems that it will get sent today as part of the rest of the arm-soc late branches.
Regards,
Tony