Skip to content

Commit

Permalink
Remove pointless casts from void pointers
Browse files Browse the repository at this point in the history 
Mostly in and around irq handlers.

Signed-off-by: Jeff 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: Dmitry Torokhov <dtor@mail.ru>
Cc: Karsten Keil <kkeil@suse.de>
Acked-by: "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: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Feb 6, 2008
1 parent bcfbf84 commit 15aafa2
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 23 deletions.
6 changes: 3 additions & 3 deletions arch/ia64/sn/pci/pcibr/pcibr_provider.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ u16 sn_ioboard_to_pci_bus(struct pci_bus *pci_bus)
static irqreturn_t
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");
}

return IRQ_HANDLED;
}

Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/amiga/cia.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct ciabase *base = (struct ciabase *)dev_id;
struct ciabase *base = dev_id;
int mach_irq;
unsigned char ints;

Expand Down
2 changes: 1 addition & 1 deletion arch/ppc/8260_io/enet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ scc_enet_rx(struct net_device *dev)
struct sk_buff *skb;
ushort pkt_len;

cep = (struct scc_enet_private *)dev->priv;
cep = dev->priv;

/* First, grab all of the stats for the incoming packet.
* These get messed up if we get called due to a busy condition.
Expand Down
2 changes: 1 addition & 1 deletion arch/ppc/8260_io/fcc_enet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ fcc_enet_rx(struct net_device *dev)
struct sk_buff *skb;
ushort pkt_len;

cep = (struct fcc_enet_private *)dev->priv;
cep = dev->priv;

/* First, grab all of the stats for the incoming packet.
* These get messed up if we get called due to a busy condition.
Expand Down
4 changes: 2 additions & 2 deletions drivers/input/touchscreen/h3600_ts_input.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ struct h3600_dev {
static irqreturn_t action_button_handler(int irq, void *dev_id)
{
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_sync(dev);
Expand All @@ -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)
{
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
Expand Down
5 changes: 2 additions & 3 deletions drivers/isdn/hardware/eicon/diva.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
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;

if (!a || !a->xdi_adapter.diva_isr_handler) {
if (!a || !a->xdi_adapter.diva_isr_handler)
return IRQ_NONE;
}

if ((clear_int_proc = a->clear_interrupts_proc)) {
(*clear_int_proc) (a);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/aic7xxx_old.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6472,7 +6472,7 @@ do_aic7xxx_isr(int irq, void *dev_id)
unsigned long cpu_flags;
struct aic7xxx_host *p;

p = (struct aic7xxx_host *)dev_id;
p = dev_id;
if(!p)
return IRQ_NONE;
spin_lock_irqsave(p->host->host_lock, cpu_flags);
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/ibmvscsi/ibmvstgt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,9 @@ static void process_iu(struct viosrp_crq *crq, struct srp_target *target)
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);

vio_disable_interrupts(vport->dma_dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/cpm_uart/cpm_uart_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
static irqreturn_t cpm_uart_int(int irq, void *data)
{
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;
smc_t __iomem *smcp = pinfo->smcp;
scc_t __iomem *sccp = pinfo->sccp;
Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/dz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ static inline void check_modem_status(struct dz_port *dport)
*/
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;

/* get the reason why we just got an irq */
Expand Down
4 changes: 2 additions & 2 deletions drivers/serial/imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static void imx_start_tx(struct uart_port *port)

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 long flags;

Expand All @@ -324,7 +324,7 @@ static irqreturn_t imx_rtsint(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;
unsigned long flags;

Expand Down
2 changes: 1 addition & 1 deletion drivers/serial/uartlite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static int ulite_transmit(struct uart_port *port, int stat)

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;

do {
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi_bfin5xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ static void giveback(struct driver_data *drv_data)

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 spi_message *msg = drv_data->cur_msg;

Expand Down
3 changes: 1 addition & 2 deletions drivers/video/bf54x-lq043fb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,7 @@ static struct lcd_device *lcd_dev;

static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
{

/*struct bfin_bf54xfb_info *info = (struct bfin_bf54xfb_info *)dev_id;*/
/*struct bfin_bf54xfb_info *info = dev_id;*/

u16 status = bfin_read_EPPI0_STATUS();

Expand Down
2 changes: 1 addition & 1 deletion drivers/video/intelfb/intelfbhw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1971,7 +1971,7 @@ void intelfbhw_cursor_reset(struct intelfb_info *dinfo)
static irqreturn_t intelfbhw_irq(int irq, void *dev_id)
{
u16 tmp;
struct intelfb_info *dinfo = (struct intelfb_info *)dev_id;
struct intelfb_info *dinfo = dev_id;

spin_lock(&dinfo->int_lock);

Expand Down

0 comments on commit 15aafa2

Please sign in to comment.