diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 6 | ||||
-rw-r--r-- | arch/m68k/amiga/cia.c | 2 | ||||
-rw-r--r-- | arch/ppc/8260_io/enet.c | 2 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index ab3eaf85fe4d..2c676cc05418 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c | |||
@@ -100,11 +100,11 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus) | |||
100 | static irqreturn_t | 100 | static irqreturn_t |
101 | pcibr_error_intr_handler(int irq, void *arg) | 101 | pcibr_error_intr_handler(int irq, void *arg) |
102 | { | 102 | { |
103 | struct pcibus_info *soft = (struct pcibus_info *)arg; | 103 | struct pcibus_info *soft = arg; |
104 | 104 | ||
105 | if (sal_pcibr_error_interrupt(soft) < 0) { | 105 | if (sal_pcibr_error_interrupt(soft) < 0) |
106 | panic("pcibr_error_intr_handler(): Fatal Bridge Error"); | 106 | panic("pcibr_error_intr_handler(): Fatal Bridge Error"); |
107 | } | 107 | |
108 | return IRQ_HANDLED; | 108 | return IRQ_HANDLED; |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/arch/m68k/amiga/cia.c b/arch/m68k/amiga/cia.c index c4a4ffd45bc0..343fab49bd9a 100644 --- a/arch/m68k/amiga/cia.c +++ b/arch/m68k/amiga/cia.c | |||
@@ -84,7 +84,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask) | |||
84 | 84 | ||
85 | static irqreturn_t cia_handler(int irq, void *dev_id) | 85 | static irqreturn_t cia_handler(int irq, void *dev_id) |
86 | { | 86 | { |
87 | struct ciabase *base = (struct ciabase *)dev_id; | 87 | struct ciabase *base = dev_id; |
88 | int mach_irq; | 88 | int mach_irq; |
89 | unsigned char ints; | 89 | unsigned char ints; |
90 | 90 | ||
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 25ef55bacd99..ec1defea9c1e 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -418,7 +418,7 @@ scc_enet_rx(struct net_device *dev) | |||
418 | struct sk_buff *skb; | 418 | struct sk_buff *skb; |
419 | ushort pkt_len; | 419 | ushort pkt_len; |
420 | 420 | ||
421 | cep = (struct scc_enet_private *)dev->priv; | 421 | cep = dev->priv; |
422 | 422 | ||
423 | /* First, grab all of the stats for the incoming packet. | 423 | /* First, grab all of the stats for the incoming packet. |
424 | * These get messed up if we get called due to a busy condition. | 424 | * These get messed up if we get called due to a busy condition. |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index a3a27dafff1f..bcc3aa9d04f3 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -682,7 +682,7 @@ fcc_enet_rx(struct net_device *dev) | |||
682 | struct sk_buff *skb; | 682 | struct sk_buff *skb; |
683 | ushort pkt_len; | 683 | ushort pkt_len; |
684 | 684 | ||
685 | cep = (struct fcc_enet_private *)dev->priv; | 685 | cep = dev->priv; |
686 | 686 | ||
687 | /* First, grab all of the stats for the incoming packet. | 687 | /* First, grab all of the stats for the incoming packet. |
688 | * These get messed up if we get called due to a busy condition. | 688 | * These get messed up if we get called due to a busy condition. |