summaryrefslogtreecommitdiffstats
path: root/cpu
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2007-10-19 08:10:15 +0200
committerWolfgang Denk <wd@denx.de>2007-10-24 00:29:06 +0200
commit9c4884f54da982ce990c7d1760ac81b0704d3c64 (patch)
treeebecc2e1358062d77fe89c555a73b97b9f2f9688 /cpu
parente78220f6e514206757acfe247297fc9a328a881f (diff)
downloadtalos-obmc-uboot-9c4884f54da982ce990c7d1760ac81b0704d3c64.tar.gz
talos-obmc-uboot-9c4884f54da982ce990c7d1760ac81b0704d3c64.zip
fix warning: no return statement in function returning non-void
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm920t/at91rm9200/usb.c8
-rw-r--r--cpu/pxa/usb.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c
index 366262e4cc..c121de6328 100644
--- a/cpu/arm920t/at91rm9200/usb.c
+++ b/cpu/arm920t/at91rm9200/usb.c
@@ -28,7 +28,7 @@
#include <asm/arch/hardware.h>
-int usb_cpu_init()
+int usb_cpu_init(void)
{
/* Enable USB host clock. */
*AT91C_PMC_SCER = AT91C_PMC_UHP; /* 48MHz clock enabled for UHP */
@@ -36,7 +36,7 @@ int usb_cpu_init()
return 0;
}
-int usb_cpu_stop()
+int usb_cpu_stop(void)
{
/* Initialization failed */
*AT91C_PMC_PCDR = 1 << AT91C_ID_UHP; /* Peripheral Clock Disable Register */
@@ -44,9 +44,9 @@ int usb_cpu_stop()
return 0;
}
-int usb_cpu_init_fail()
+int usb_cpu_init_fail(void)
{
- usb_cpu_stop();
+ return usb_cpu_stop();
}
# endif /* CONFIG_AT91RM9200 */
diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index 3c11d4de44..d2812a413e 100644
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -28,7 +28,7 @@
#include <asm/arch/pxa-regs.h>
-int usb_cpu_init()
+int usb_cpu_init(void)
{
#if defined(CONFIG_CPU_MONAHANS)
/* Enable USB host clock. */
@@ -65,7 +65,7 @@ int usb_cpu_init()
return 0;
}
-int usb_cpu_stop()
+int usb_cpu_stop(void)
{
UHCHR |= UHCHR_FHR;
udelay(11);
@@ -86,7 +86,7 @@ int usb_cpu_stop()
return 0;
}
-int usb_cpu_init_fail()
+int usb_cpu_init_fail(void)
{
return 0;
}
OpenPOWER on IntegriCloud