forked from Minki/linux
ef24ba7091
NO_IRQ has been == 0 on powerpc for just over ten years (since commit
0ebfff1491 ("[POWERPC] Add new interrupt mapping core and change
platforms to use it")). It's also 0 on most other arches.
Although it's fairly harmless, every now and then it causes confusion
when a driver is built on powerpc and another arch which doesn't define
NO_IRQ. There's at least 6 definitions of NO_IRQ in drivers/, at least
some of which are to work around that problem.
So we'd like to remove it. This is fairly trivial in the arch code, we
just convert:
if (irq == NO_IRQ) to if (!irq)
if (irq != NO_IRQ) to if (irq)
irq = NO_IRQ; to irq = 0;
return NO_IRQ; to return 0;
And a few other odd cases as well.
At least for now we keep the #define NO_IRQ, because there is driver
code that uses NO_IRQ and the fixes to remove those will go via other
trees.
Note we also change some occurrences in PPC sound drivers, drivers/ps3,
and drivers/macintosh.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
95 lines
2.2 KiB
C
95 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2007 PA Semi, Inc
|
|
*
|
|
* Parts based on arch/powerpc/sysdev/fsl_soc.c:
|
|
*
|
|
* 2006 (c) MontaVista Software, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/of.h>
|
|
#include <linux/i2c.h>
|
|
|
|
#ifdef CONFIG_I2C_BOARDINFO
|
|
/* The below is from fsl_soc.c. It's copied because since there are no
|
|
* official bus bindings at this time it doesn't make sense to share across
|
|
* the platforms, even though they happen to be common.
|
|
*/
|
|
struct i2c_driver_device {
|
|
char *of_device;
|
|
char *i2c_type;
|
|
};
|
|
|
|
static struct i2c_driver_device i2c_devices[] __initdata = {
|
|
{"dallas,ds1338", "ds1338"},
|
|
};
|
|
|
|
static int __init find_i2c_driver(struct device_node *node,
|
|
struct i2c_board_info *info)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
|
|
if (!of_device_is_compatible(node, i2c_devices[i].of_device))
|
|
continue;
|
|
if (strlcpy(info->type, i2c_devices[i].i2c_type,
|
|
I2C_NAME_SIZE) >= I2C_NAME_SIZE)
|
|
return -ENOMEM;
|
|
return 0;
|
|
}
|
|
return -ENODEV;
|
|
}
|
|
|
|
static int __init pasemi_register_i2c_devices(void)
|
|
{
|
|
struct pci_dev *pdev;
|
|
struct device_node *adap_node;
|
|
struct device_node *node;
|
|
|
|
pdev = NULL;
|
|
while ((pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa003, pdev))) {
|
|
adap_node = pci_device_to_OF_node(pdev);
|
|
|
|
if (!adap_node)
|
|
continue;
|
|
|
|
node = NULL;
|
|
while ((node = of_get_next_child(adap_node, node))) {
|
|
struct i2c_board_info info = {};
|
|
const u32 *addr;
|
|
int len;
|
|
|
|
addr = of_get_property(node, "reg", &len);
|
|
if (!addr || len < sizeof(int) ||
|
|
*addr > (1 << 10) - 1) {
|
|
printk(KERN_WARNING
|
|
"pasemi_register_i2c_devices: "
|
|
"invalid i2c device entry\n");
|
|
continue;
|
|
}
|
|
|
|
info.irq = irq_of_parse_and_map(node, 0);
|
|
if (!info.irq)
|
|
info.irq = -1;
|
|
|
|
if (find_i2c_driver(node, &info) < 0)
|
|
continue;
|
|
|
|
info.addr = *addr;
|
|
|
|
i2c_register_board_info(PCI_FUNC(pdev->devfn), &info,
|
|
1);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
device_initcall(pasemi_register_i2c_devices);
|
|
#endif
|