iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: coding style fixes to arch/x86/pci/irq.

Browse Source 
Before:
total: 60 errors, 85 warnings, 1237 lines checked

After:
total: 1 errors, 82 warnings, 1226 lines checked

WARNING: line over 80 characters

Compile tested.

paolo@paolo-desktop:/tmp$ size irq.o.*
   text    data     bss     dec     hex filename
   6128     440      76    6644    19f4 irq.o.after
   6128     440      76    6644    19f4 irq.o.before

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Paolo Ciarrocchi
2008-06-07 14:14:35 +02:00
committed by Ingo Molnar
parent ce8e37cdbd
commit 7058b06188
1 changed files with 125 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
arch/x86/pci/irq.c
View File

@ -11,8 +11,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/smp.h> #include <linux/smp.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/acpi.h> #include <linux/acpi.h>
@ -487,9 +487,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq
u8 irq; u8 irq;
irq = 0; irq = 0;
if (pirq <= 4) if (pirq <= 4)
{
irq = read_config_nybble(router, 0x56, pirq - 1); irq = read_config_nybble(router, 0x56, pirq - 1);
}
printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n",
dev->vendor, dev->device, pirq, irq); dev->vendor, dev->device, pirq, irq);
return irq; return irq;
@ -500,9 +498,7 @@ static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq
printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n",
dev->vendor, dev->device, pirq, irq); dev->vendor, dev->device, pirq, irq);
if (pirq <= 4) if (pirq <= 4)
{
write_config_nybble(router, 0x56, pirq - 1, irq); write_config_nybble(router, 0x56, pirq - 1, irq);
}
return 1; return 1;
} }
@ -549,8 +545,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
if (pci_dev_present(pirq_440gx)) if (pci_dev_present(pirq_440gx))
return 0; return 0;
switch(device) switch (device) {
{
case PCI_DEVICE_ID_INTEL_82371FB_0: case PCI_DEVICE_ID_INTEL_82371FB_0:
case PCI_DEVICE_ID_INTEL_82371SB_0: case PCI_DEVICE_ID_INTEL_82371SB_0:
case PCI_DEVICE_ID_INTEL_82371AB_0: case PCI_DEVICE_ID_INTEL_82371AB_0:
@ -647,8 +642,7 @@ static __init int via_router_probe(struct irq_router *r,
static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_VLSI_82C534: case PCI_DEVICE_ID_VLSI_82C534:
r->name = "VLSI 82C534"; r->name = "VLSI 82C534";
r->get = pirq_vlsi_get; r->get = pirq_vlsi_get;
@ -661,8 +655,7 @@ static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router
static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_SERVERWORKS_OSB4: case PCI_DEVICE_ID_SERVERWORKS_OSB4:
case PCI_DEVICE_ID_SERVERWORKS_CSB5: case PCI_DEVICE_ID_SERVERWORKS_CSB5:
r->name = "ServerWorks"; r->name = "ServerWorks";
@ -686,8 +679,7 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router,
static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_CYRIX_5520: case PCI_DEVICE_ID_CYRIX_5520:
r->name = "NatSemi"; r->name = "NatSemi";
r->get = pirq_cyrix_get; r->get = pirq_cyrix_get;
@ -699,8 +691,7 @@ static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *route
static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_OPTI_82C700: case PCI_DEVICE_ID_OPTI_82C700:
r->name = "OPTI"; r->name = "OPTI";
r->get = pirq_opti_get; r->get = pirq_opti_get;
@ -712,8 +703,7 @@ static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router
static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_ITE_IT8330G_0: case PCI_DEVICE_ID_ITE_IT8330G_0:
r->name = "ITE"; r->name = "ITE";
r->get = pirq_ite_get; r->get = pirq_ite_get;
@ -725,8 +715,7 @@ static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router,
static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_AL_M1533: case PCI_DEVICE_ID_AL_M1533:
case PCI_DEVICE_ID_AL_M1563: case PCI_DEVICE_ID_AL_M1563:
printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n");
@ -740,8 +729,7 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router,
static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
{ {
switch(device) switch (device) {
{
case PCI_DEVICE_ID_AMD_VIPER_740B: case PCI_DEVICE_ID_AMD_VIPER_740B:
r->name = "AMD756"; r->name = "AMD756";
break; break;
@ -921,8 +909,10 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
*/ */
newirq = dev->irq; newirq = dev->irq;
if (newirq && !((1 << newirq) & mask)) { if (newirq && !((1 << newirq) & mask)) {
if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; if (pci_probe & PCI_USE_PIRQ_MASK)
else printk("\n" KERN_WARNING newirq = 0;
else
printk("\n" KERN_WARNING
"PCI: IRQ %i for device %s doesn't match PIRQ mask " "PCI: IRQ %i for device %s doesn't match PIRQ mask "
"- try pci=usepirqmask\n" KERN_DEBUG, newirq, "- try pci=usepirqmask\n" KERN_DEBUG, newirq,
pci_name(dev)); pci_name(dev));
@ -1024,8 +1014,7 @@ static void __init pcibios_fixup_irqs(void)
/* /*
* Recalculate IRQ numbers if we use the I/O APIC. * Recalculate IRQ numbers if we use the I/O APIC.
*/ */
if (io_apic_assign_pci_irqs) if (io_apic_assign_pci_irqs) {
{
int irq; int irq;
if (pin) { if (pin) {