mirror of
https://github.com/torvalds/linux
synced 2024-10-23 11:46:42 +00:00
9c7f4f5ce6
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>
53 lines
970 B
C
53 lines
970 B
C
/*
|
|
* linux/arch/arm/mach-shark/pci.c
|
|
*
|
|
* PCI bios-type initialisation for PCI machines
|
|
*
|
|
* Bits taken from various places.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/init.h>
|
|
#include <video/vga.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/mach/pci.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
if (dev->bus->number == 0)
|
|
if (dev->devfn == 0)
|
|
return 255;
|
|
else
|
|
return 11;
|
|
else
|
|
return 255;
|
|
}
|
|
|
|
extern void __init via82c505_preinit(void);
|
|
|
|
static struct hw_pci shark_pci __initdata = {
|
|
.setup = via82c505_setup,
|
|
.map_irq = shark_map_irq,
|
|
.nr_controllers = 1,
|
|
.ops = &via82c505_ops,
|
|
.preinit = via82c505_preinit,
|
|
};
|
|
|
|
static int __init shark_pci_init(void)
|
|
{
|
|
if (!machine_is_shark())
|
|
return -ENODEV;
|
|
|
|
pcibios_min_io = 0x6000;
|
|
pcibios_min_mem = 0x50000000;
|
|
vga_base = 0xe8000000;
|
|
|
|
pci_common_init(&shark_pci);
|
|
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(shark_pci_init);
|