summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shark
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 16:36:59 +0000
committerArnd Bergmann <arnd@arndb.de>2012-10-04 10:19:51 +0200
commit9c7f4f5ce6523af6b6e103a991b2ca71b962acb7 (patch)
treed52150eb23b6b1f34ba03760d68c424f5cac7f91 /arch/arm/mach-shark
parenta0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff)
downloadop-kernel-dev-9c7f4f5ce6523af6b6e103a991b2ca71b962acb7.zip
op-kernel-dev-9c7f4f5ce6523af6b6e103a991b2ca71b962acb7.tar.gz
ARM: shark: fix shark_pci_init return code
When run on the wrong platform, the shark_pci_init function returns an undefined value, as reported by a gcc warning, so let's just return -ENODEV. Without this patch, building shark_defconfig results in: arch/arm/mach-shark/pci.c: In function 'shark_pci_init': arch/arm/mach-shark/pci.c:42:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: "Krzysztof Halasa" <khc@pm.waw.pl>
Diffstat (limited to 'arch/arm/mach-shark')
-rw-r--r--arch/arm/mach-shark/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c
index 9089407..2b351a3 100644
--- a/arch/arm/mach-shark/pci.c
+++ b/arch/arm/mach-shark/pci.c
@@ -38,7 +38,7 @@ static struct hw_pci shark_pci __initdata = {
static int __init shark_pci_init(void)
{
if (!machine_is_shark())
- return;
+ return -ENODEV;
pcibios_min_io = 0x6000;
pcibios_min_mem = 0x50000000;
OpenPOWER on IntegriCloud