mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: remove printks about disabled bridge windows
PCI: fold pci_calc_resource_flags() into decode_bar()
PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
PCI: correct pcie_set_readrq write size
PCI: pciehp: change wait time for valid configuration access
x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
PCI: ARI is a PCIe v2 feature
x86/PCI: quirks: Use pci_dev->revision
PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
PCI hotplug: cpqphp: use pci_dev->vendor
PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
x86/PCI: config space accessor functions should not ignore the segment argument
PCI: Assign values to 'pci_obff_signal_type' enumeration constants
x86/PCI: reduce severity of host bridge window conflict warnings
PCI: enumerate the PCI device only removed out PCI hieratchy of OS when re-scanning PCI
PCI: PCIe AER: add aer_recover_queue
x86/PCI: select direct access mode for mmconfig option
PCI hotplug: Rename is_ejectable which also exists in dock.c
This commit is contained in:
Linus Torvalds
commit
f85f19de90
120 changed files with 294 additions and 215 deletions
|
|
@ -144,7 +144,7 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
|
|||
}
|
||||
|
||||
/* mapping for on-chip devices */
|
||||
int __init it8152_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
int __init it8152_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if ((dev->vendor == PCI_VENDOR_ID_ITE) &&
|
||||
(dev->device == PCI_DEVICE_ID_ITE_8152)) {
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ struct pci_sys_data;
|
|||
|
||||
extern void it8152_irq_demux(unsigned int irq, struct irq_desc *desc);
|
||||
extern void it8152_init_irq(void);
|
||||
extern int it8152_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
|
||||
extern int it8152_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
|
||||
extern int it8152_pci_setup(int nr, struct pci_sys_data *sys);
|
||||
extern struct pci_bus *it8152_pci_scan_bus(int nr, struct pci_sys_data *sys);
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ struct hw_pci {
|
|||
void (*preinit)(void);
|
||||
void (*postinit)(void);
|
||||
u8 (*swizzle)(struct pci_dev *dev, u8 *pin);
|
||||
int (*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
|
||||
int (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -44,7 +44,7 @@ struct pci_sys_data {
|
|||
/* Bridge swizzling */
|
||||
u8 (*swizzle)(struct pci_dev *, u8 *);
|
||||
/* IRQ mapping */
|
||||
int (*map_irq)(struct pci_dev *, u8, u8);
|
||||
int (*map_irq)(const struct pci_dev *, u8, u8);
|
||||
struct hw_pci *hw;
|
||||
void *private_data; /* platform controller private data */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -476,7 +476,7 @@ static u8 __devinit pcibios_swizzle(struct pci_dev *dev, u8 *pin)
|
|||
/*
|
||||
* Map a slot/pin to an IRQ.
|
||||
*/
|
||||
static int pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
struct pci_sys_data *sys = dev->sysdata;
|
||||
int irq = -1;
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ static struct pci_bus *cns3xxx_pci_scan_bus(int nr, struct pci_sys_data *sys)
|
|||
return pci_scan_bus(sys->busnr, &cns3xxx_pcie_ops, sys);
|
||||
}
|
||||
|
||||
static int cns3xxx_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
struct cns3xxx_pcie *cnspci = pdev_to_cnspci(dev);
|
||||
int irq = cnspci->irqs[slot];
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)
|
|||
return bus;
|
||||
}
|
||||
|
||||
static int __init dove_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
struct pcie_port *pp = bus_to_port(dev->bus->number);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
/* cats host-specific stuff */
|
||||
static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
|
||||
|
||||
static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (dev->irq >= 255)
|
||||
return -1; /* not a valid interrupt. */
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
|
||||
|
||||
static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
|
||||
dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* We now use the slot ID instead of the device identifiers to select
|
||||
* which interrupt is routed where.
|
||||
*/
|
||||
static int __init netwinder_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
switch (slot) {
|
||||
case 0: /* host bridge */
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ static int irqmap_personal_server[] __initdata = {
|
|||
IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI
|
||||
};
|
||||
|
||||
static int __init personal_server_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
unsigned char line;
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ static int irq_tab[4] __initdata = {
|
|||
* map the specified device/slot/pin to an IRQ. This works out such
|
||||
* that slot 9 pin 1 is INT0, pin 2 is INT1, and slot 10 pin 1 is INT1.
|
||||
*/
|
||||
static int __init integrator_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init integrator_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int intnr = ((slot - 9) + (pin - 1)) & 3;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */
|
||||
|
||||
static int __init
|
||||
iq81340mc_pcix_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
|
||||
iq81340mc_pcix_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin)
|
||||
{
|
||||
switch (idsel) {
|
||||
case 1:
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ static int iop13xx_atue_pci_status(int clear)
|
|||
}
|
||||
|
||||
static int
|
||||
iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
|
||||
iop13xx_pcie_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin)
|
||||
{
|
||||
WARN_ON(idsel != 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ void __init em7210_map_io(void)
|
|||
#define INTD IRQ_IOP32X_XINT3
|
||||
|
||||
static int __init
|
||||
em7210_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
em7210_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[][4] = {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ void __init glantank_map_io(void)
|
|||
#define INTD IRQ_IOP32X_XINT3
|
||||
|
||||
static int __init
|
||||
glantank_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
glantank_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[][4] = {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ void __init iq31244_map_io(void)
|
|||
* EP80219/IQ31244 PCI.
|
||||
*/
|
||||
static int __init
|
||||
ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
ep80219_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ static struct hw_pci ep80219_pci __initdata = {
|
|||
};
|
||||
|
||||
static int __init
|
||||
iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
iq31244_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ void __init iq80321_map_io(void)
|
|||
* IQ80321 PCI.
|
||||
*/
|
||||
static int __init
|
||||
iq80321_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
iq80321_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ void __init n2100_map_io(void)
|
|||
* N2100 PCI.
|
||||
*/
|
||||
static int __init
|
||||
n2100_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ static struct sys_timer iq80331_timer = {
|
|||
* IQ80331 PCI.
|
||||
*/
|
||||
static int __init
|
||||
iq80331_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
iq80331_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ static struct sys_timer iq80332_timer = {
|
|||
* IQ80332 PCI.
|
||||
*/
|
||||
static int __init
|
||||
iq80332_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
iq80332_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,8 @@ static struct pci_bus * __init enp2611_pci_scan_bus(int nr,
|
|||
return pci_scan_bus(sys->busnr, &enp2611_pci_ops, sys);
|
||||
}
|
||||
|
||||
static int __init enp2611_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init enp2611_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,8 @@ int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int __init ixdp2400_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdp2400_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
if (ixdp2x00_master_npu()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -161,7 +161,8 @@ static int __init ixdp2800_pci_setup(int nr, struct pci_sys_data *sys)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int __init ixdp2800_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdp2800_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
if (ixdp2x00_master_npu()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -252,7 +252,8 @@ void __init ixdp2x01_pci_preinit(void)
|
|||
|
||||
#define DEVPIN(dev, pin) ((pin) | ((dev) << 3))
|
||||
|
||||
static int __init ixdp2x01_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdp2x01_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
u8 bus = dev->bus->number;
|
||||
u32 devpin = DEVPIN(PCI_SLOT(dev->devfn), pin);
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ void __init ixdp2351_init_irq(void)
|
|||
*/
|
||||
#define DEVPIN(dev, pin) ((pin) | ((dev) << 3))
|
||||
|
||||
static int __init ixdp2351_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdp2351_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
u8 bus = dev->bus->number;
|
||||
u32 devpin = DEVPIN(PCI_SLOT(dev->devfn), pin);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@
|
|||
#define INTC_PIN IXP23XX_GPIO_PIN_11
|
||||
#define INTD_PIN IXP23XX_GPIO_PIN_12
|
||||
|
||||
static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
|
||||
static int __init roadrunner_map_irq(const struct pci_dev *dev, u8 idsel,
|
||||
u8 pin)
|
||||
{
|
||||
static int pci_card_slot_irq[] = {INTB, INTC, INTD, INTA};
|
||||
static int pmc_card_slot_irq[] = {INTA, INTB, INTC, INTD};
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ void __init avila_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init avila_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init avila_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[IRQ_LINES] = {
|
||||
IXP4XX_GPIO_IRQ(INTA),
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ void __init coyote_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init coyote_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init coyote_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (slot == SLOT0_DEVID)
|
||||
return IXP4XX_GPIO_IRQ(SLOT0_INTA);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ void __init dsmg600_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init dsmg600_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init dsmg600_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
|
||||
{ IXP4XX_GPIO_IRQ(INTE), -1, -1 },
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ void __init fsg_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init fsg_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init fsg_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[IRQ_LINES] = {
|
||||
IXP4XX_GPIO_IRQ(INTC),
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ void __init gateway7001_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
if (slot == 1)
|
||||
return IRQ_IXP4XX_GPIO11;
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ static void __init gmlr_pci_postinit(void)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init gmlr_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init gmlr_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
switch(slot) {
|
||||
case SLOT_ETHA: return IXP4XX_GPIO_IRQ(GPIO_IRQ_ETHA);
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ void __init gtwx5715_pci_preinit(void)
|
|||
}
|
||||
|
||||
|
||||
static int __init gtwx5715_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init gtwx5715_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int rc = -1;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ void __init ixdp425_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init ixdp425_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdp425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[IRQ_LINES] = {
|
||||
IXP4XX_GPIO_IRQ(INTA),
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ void __init ixdpg425_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init ixdpg425_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init ixdpg425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (slot == 12 || slot == 13)
|
||||
return IRQ_IXP4XX_GPIO7;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ void __init nas100d_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init nas100d_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init nas100d_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[MAX_DEV][IRQ_LINES] = {
|
||||
{ IXP4XX_GPIO_IRQ(INTA), -1, -1 },
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ void __init nslu2_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init nslu2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init nslu2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
static int pci_irq_table[IRQ_LINES] = {
|
||||
IXP4XX_GPIO_IRQ(INTA),
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ void __init vulcan_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init vulcan_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init vulcan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (slot == 1)
|
||||
return IXP4XX_GPIO_IRQ(INTA);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ void __init wg302v2_pci_preinit(void)
|
|||
ixp4xx_pci_preinit();
|
||||
}
|
||||
|
||||
static int __init wg302v2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init wg302v2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (slot == 1)
|
||||
return IRQ_IXP4XX_GPIO8;
|
||||
|
|
|
|||
|
|
@ -245,7 +245,8 @@ kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)
|
|||
return bus;
|
||||
}
|
||||
|
||||
static int __init kirkwood_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
struct pcie_port *pp = bus_to_port(dev->bus);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "generic.h"
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static int dsm320_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int dsm320_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
switch (slot) {
|
||||
case 0:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "generic.h"
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int micrel_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
return KS8695_IRQ_EXTERN0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ extern void __init ks8695_init_leds(u8 cpu_led, u8 timer_led);
|
|||
|
||||
struct ks8695_pci_cfg {
|
||||
short mode;
|
||||
int (*map_irq)(struct pci_dev *, u8, u8);
|
||||
int (*map_irq)(const struct pci_dev *, u8, u8);
|
||||
};
|
||||
extern __init void ks8695_init_pci(struct ks8695_pci_cfg *);
|
||||
|
||||
|
|
|
|||
|
|
@ -260,7 +260,8 @@ mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys)
|
|||
return bus;
|
||||
}
|
||||
|
||||
static int __init mv78xx0_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
struct pcie_port *pp = bus_to_port(dev->bus->number);
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ void orion5x_pci_disable(void);
|
|||
void orion5x_pci_set_cardbus_mode(void);
|
||||
int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
|
||||
struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
|
||||
int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
|
||||
int orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin);
|
||||
|
||||
struct machine_desc;
|
||||
struct meminfo;
|
||||
|
|
|
|||
|
|
@ -237,7 +237,8 @@ void __init db88f5281_pci_preinit(void)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init db88f5281_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init db88f5281_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -70,14 +70,14 @@ enum {
|
|||
* PCI setup
|
||||
*/
|
||||
|
||||
static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
/*
|
||||
* Check for devices with hard-wired IRQs.
|
||||
*/
|
||||
irq = orion5x_pci_map_irq(dev, slot, pin);
|
||||
irq = orion5x_pci_map_irq(const dev, slot, pin);
|
||||
if (irq != -1)
|
||||
return irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,8 @@ static struct platform_device kurobox_pro_nor_flash = {
|
|||
* PCI
|
||||
****************************************************************************/
|
||||
|
||||
static int __init kurobox_pro_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init kurobox_pro_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static struct platform_device mss2_nor_flash = {
|
|||
/****************************************************************************
|
||||
* PCI setup
|
||||
****************************************************************************/
|
||||
static int __init mss2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init mss2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys
|
|||
return bus;
|
||||
}
|
||||
|
||||
int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
int __init orion5x_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int bus = dev->bus->number;
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ static void __init rd88f5181l_fxo_init(void)
|
|||
}
|
||||
|
||||
static int __init
|
||||
rd88f5181l_fxo_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
rd88f5181l_fxo_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ static void __init rd88f5181l_ge_init(void)
|
|||
}
|
||||
|
||||
static int __init
|
||||
rd88f5181l_ge_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
rd88f5181l_ge_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -172,7 +172,8 @@ void __init rd88f5182_pci_preinit(void)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init rd88f5182_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init rd88f5182_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ void __init tsp2_pci_preinit(void)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init tsp2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init tsp2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -143,7 +143,8 @@ void __init qnap_ts209_pci_preinit(void)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init qnap_ts209_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init qnap_ts209_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,8 @@ static struct platform_device qnap_ts409_nor_flash = {
|
|||
* PCI
|
||||
****************************************************************************/
|
||||
|
||||
static int __init qnap_ts409_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init qnap_ts409_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,8 @@ static void __init wnr854t_init(void)
|
|||
platform_device_register(&wnr854t_nor_flash);
|
||||
}
|
||||
|
||||
static int __init wnr854t_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init wnr854t_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -221,7 +221,8 @@ static void __init wrt350n_v2_init(void)
|
|||
platform_device_register(&wrt350n_v2_button_device);
|
||||
}
|
||||
|
||||
static int __init wrt350n_v2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init wrt350n_v2_pci_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ void cmx2xx_pci_resume(void) {}
|
|||
#endif
|
||||
|
||||
/* PCI IRQ mapping*/
|
||||
static int __init cmx2xx_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init cmx2xx_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,8 @@ static struct pci_ops pci_nano_ops = {
|
|||
.write = nanoengine_write_config,
|
||||
};
|
||||
|
||||
static int __init pci_nanoengine_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init pci_nanoengine_map_irq(const struct pci_dev *dev, u8 slot,
|
||||
u8 pin)
|
||||
{
|
||||
return NANOENGINE_IRQ_GPIO_PCI;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <asm/mach/pci.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
if (dev->bus->number == 0)
|
||||
if (dev->devfn == 0)
|
||||
|
|
|
|||
|
|
@ -449,7 +449,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int tegra_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int tegra_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
return INT_PCIE_INTR;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ void __init pci_versatile_preinit(void)
|
|||
/*
|
||||
* map the specified device/slot/pin to an IRQ. Different backplanes may need to modify this.
|
||||
*/
|
||||
static int __init versatile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||
static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int irq;
|
||||
int devslot = PCI_SLOT(dev->devfn);
|
||||
|
|
|
|||
Loading…
Reference in a new issue