Commit 15aafa2f authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds

Remove pointless casts from void pointers

Mostly in and around irq handlers.
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: "Luck Tony" <tony.luck@intel.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Cc: Karsten Keil <kkeil@suse.de>
Acked-by: default avatar"John W. Linville" <linville@tuxdriver.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bcfbf84d
...@@ -100,11 +100,11 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus) ...@@ -100,11 +100,11 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
static irqreturn_t static irqreturn_t
pcibr_error_intr_handler(int irq, void *arg) pcibr_error_intr_handler(int irq, void *arg)
{ {
struct pcibus_info *soft = (struct pcibus_info *)arg; struct pcibus_info *soft = arg;
if (sal_pcibr_error_interrupt(soft) < 0) { if (sal_pcibr_error_interrupt(soft) < 0)
panic("pcibr_error_intr_handler(): Fatal Bridge Error"); panic("pcibr_error_intr_handler(): Fatal Bridge Error");
}
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -84,7 +84,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask) ...@@ -84,7 +84,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
static irqreturn_t cia_handler(int irq, void *dev_id) static irqreturn_t cia_handler(int irq, void *dev_id)
{ {
struct ciabase *base = (struct ciabase *)dev_id; struct ciabase *base = dev_id;
int mach_irq; int mach_irq;
unsigned char ints; unsigned char ints;
......
...@@ -418,7 +418,7 @@ scc_enet_rx(struct net_device *dev) ...@@ -418,7 +418,7 @@ scc_enet_rx(struct net_device *dev)
struct sk_buff *skb; struct sk_buff *skb;
ushort pkt_len; ushort pkt_len;
cep = (struct scc_enet_private *)dev->priv; cep = dev->priv;
/* First, grab all of the stats for the incoming packet. /* First, grab all of the stats for the incoming packet.
* These get messed up if we get called due to a busy condition. * These get messed up if we get called due to a busy condition.
......
...@@ -682,7 +682,7 @@ fcc_enet_rx(struct net_device *dev) ...@@ -682,7 +682,7 @@ fcc_enet_rx(struct net_device *dev)
struct sk_buff *skb; struct sk_buff *skb;
ushort pkt_len; ushort pkt_len;
cep = (struct fcc_enet_private *)dev->priv; cep = dev->priv;
/* First, grab all of the stats for the incoming packet. /* First, grab all of the stats for the incoming packet.
* These get messed up if we get called due to a busy condition. * These get messed up if we get called due to a busy condition.
......
...@@ -109,7 +109,7 @@ struct h3600_dev { ...@@ -109,7 +109,7 @@ struct h3600_dev {
static irqreturn_t action_button_handler(int irq, void *dev_id) static irqreturn_t action_button_handler(int irq, void *dev_id)
{ {
int down = (GPLR & GPIO_BITSY_ACTION_BUTTON) ? 0 : 1; int down = (GPLR & GPIO_BITSY_ACTION_BUTTON) ? 0 : 1;
struct input_dev *dev = (struct input_dev *) dev_id; struct input_dev *dev = dev_id;
input_report_key(dev, KEY_ENTER, down); input_report_key(dev, KEY_ENTER, down);
input_sync(dev); input_sync(dev);
...@@ -120,7 +120,7 @@ static irqreturn_t action_button_handler(int irq, void *dev_id) ...@@ -120,7 +120,7 @@ static irqreturn_t action_button_handler(int irq, void *dev_id)
static irqreturn_t npower_button_handler(int irq, void *dev_id) static irqreturn_t npower_button_handler(int irq, void *dev_id)
{ {
int down = (GPLR & GPIO_BITSY_NPOWER_BUTTON) ? 0 : 1; int down = (GPLR & GPIO_BITSY_NPOWER_BUTTON) ? 0 : 1;
struct input_dev *dev = (struct input_dev *) dev_id; struct input_dev *dev = dev_id;
/* /*
* This interrupt is only called when we release the key. So we have * This interrupt is only called when we release the key. So we have
......
...@@ -515,12 +515,11 @@ diva_xdi_read(void *adapter, void *os_handle, void __user *dst, ...@@ -515,12 +515,11 @@ diva_xdi_read(void *adapter, void *os_handle, void __user *dst,
irqreturn_t diva_os_irq_wrapper(int irq, void *context) irqreturn_t diva_os_irq_wrapper(int irq, void *context)
{ {
diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context; diva_os_xdi_adapter_t *a = context;
diva_xdi_clear_interrupts_proc_t clear_int_proc; diva_xdi_clear_interrupts_proc_t clear_int_proc;
if (!a || !a->xdi_adapter.diva_isr_handler) { if (!a || !a->xdi_adapter.diva_isr_handler)
return IRQ_NONE; return IRQ_NONE;
}
if ((clear_int_proc = a->clear_interrupts_proc)) { if ((clear_int_proc = a->clear_interrupts_proc)) {
(*clear_int_proc) (a); (*clear_int_proc) (a);
......
...@@ -6472,7 +6472,7 @@ do_aic7xxx_isr(int irq, void *dev_id) ...@@ -6472,7 +6472,7 @@ do_aic7xxx_isr(int irq, void *dev_id)
unsigned long cpu_flags; unsigned long cpu_flags;
struct aic7xxx_host *p; struct aic7xxx_host *p;
p = (struct aic7xxx_host *)dev_id; p = dev_id;
if(!p) if(!p)
return IRQ_NONE; return IRQ_NONE;
spin_lock_irqsave(p->host->host_lock, cpu_flags); spin_lock_irqsave(p->host->host_lock, cpu_flags);
......
...@@ -539,9 +539,9 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target) ...@@ -539,9 +539,9 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
srp_iu_put(iue); srp_iu_put(iue);
} }
static irqreturn_t ibmvstgt_interrupt(int irq, void *data) static irqreturn_t ibmvstgt_interrupt(int dummy, void *data)
{ {
struct srp_target *target = (struct srp_target *) data; struct srp_target *target = data;
struct vio_port *vport = target_to_port(target); struct vio_port *vport = target_to_port(target);
vio_disable_interrupts(vport->dma_dev); vio_disable_interrupts(vport->dma_dev);
......
...@@ -380,7 +380,7 @@ static void cpm_uart_int_rx(struct uart_port *port) ...@@ -380,7 +380,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
static irqreturn_t cpm_uart_int(int irq, void *data) static irqreturn_t cpm_uart_int(int irq, void *data)
{ {
u8 events; u8 events;
struct uart_port *port = (struct uart_port *)data; struct uart_port *port = data;
struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port; struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
smc_t __iomem *smcp = pinfo->smcp; smc_t __iomem *smcp = pinfo->smcp;
scc_t __iomem *sccp = pinfo->sccp; scc_t __iomem *sccp = pinfo->sccp;
......
...@@ -324,7 +324,7 @@ static inline void check_modem_status(struct dz_port *dport) ...@@ -324,7 +324,7 @@ static inline void check_modem_status(struct dz_port *dport)
*/ */
static irqreturn_t dz_interrupt(int irq, void *dev) static irqreturn_t dz_interrupt(int irq, void *dev)
{ {
struct dz_port *dport = (struct dz_port *)dev; struct dz_port *dport = dev;
unsigned short status; unsigned short status;
/* get the reason why we just got an irq */ /* get the reason why we just got an irq */
......
...@@ -308,7 +308,7 @@ static void imx_start_tx(struct uart_port *port) ...@@ -308,7 +308,7 @@ static void imx_start_tx(struct uart_port *port)
static irqreturn_t imx_rtsint(int irq, void *dev_id) static irqreturn_t imx_rtsint(int irq, void *dev_id)
{ {
struct imx_port *sport = (struct imx_port *)dev_id; struct imx_port *sport = dev_id;
unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS; unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
unsigned long flags; unsigned long flags;
...@@ -324,7 +324,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id) ...@@ -324,7 +324,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
static irqreturn_t imx_txint(int irq, void *dev_id) static irqreturn_t imx_txint(int irq, void *dev_id)
{ {
struct imx_port *sport = (struct imx_port *)dev_id; struct imx_port *sport = dev_id;
struct circ_buf *xmit = &sport->port.info->xmit; struct circ_buf *xmit = &sport->port.info->xmit;
unsigned long flags; unsigned long flags;
......
...@@ -142,7 +142,7 @@ static int ulite_transmit(struct uart_port *port, int stat) ...@@ -142,7 +142,7 @@ static int ulite_transmit(struct uart_port *port, int stat)
static irqreturn_t ulite_isr(int irq, void *dev_id) static irqreturn_t ulite_isr(int irq, void *dev_id)
{ {
struct uart_port *port = (struct uart_port *)dev_id; struct uart_port *port = dev_id;
int busy; int busy;
do { do {
......
...@@ -616,7 +616,7 @@ static void giveback(struct driver_data *drv_data) ...@@ -616,7 +616,7 @@ static void giveback(struct driver_data *drv_data)
static irqreturn_t dma_irq_handler(int irq, void *dev_id) static irqreturn_t dma_irq_handler(int irq, void *dev_id)
{ {
struct driver_data *drv_data = (struct driver_data *)dev_id; struct driver_data *drv_data = dev_id;
struct chip_data *chip = drv_data->cur_chip; struct chip_data *chip = drv_data->cur_chip;
struct spi_message *msg = drv_data->cur_msg; struct spi_message *msg = drv_data->cur_msg;
......
...@@ -498,8 +498,7 @@ static struct lcd_device *lcd_dev; ...@@ -498,8 +498,7 @@ static struct lcd_device *lcd_dev;
static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id) static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
{ {
/*struct bfin_bf54xfb_info *info = dev_id;*/
/*struct bfin_bf54xfb_info *info = (struct bfin_bf54xfb_info *)dev_id;*/
u16 status = bfin_read_EPPI0_STATUS(); u16 status = bfin_read_EPPI0_STATUS();
......
...@@ -1971,7 +1971,7 @@ void intelfbhw_cursor_reset(struct intelfb_info *dinfo) ...@@ -1971,7 +1971,7 @@ void intelfbhw_cursor_reset(struct intelfb_info *dinfo)
static irqreturn_t intelfbhw_irq(int irq, void *dev_id) static irqreturn_t intelfbhw_irq(int irq, void *dev_id)
{ {
u16 tmp; u16 tmp;
struct intelfb_info *dinfo = (struct intelfb_info *)dev_id; struct intelfb_info *dinfo = dev_id;
spin_lock(&dinfo->int_lock); spin_lock(&dinfo->int_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment