diff options
-rw-r--r-- | arch/cris/arch-v32/drivers/mach-fs/gpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-fs/gpio.c b/arch/cris/arch-v32/drivers/mach-fs/gpio.c index 3a12ce309e3b..5ec8a7d4e7d7 100644 --- a/arch/cris/arch-v32/drivers/mach-fs/gpio.c +++ b/arch/cris/arch-v32/drivers/mach-fs/gpio.c | |||
@@ -184,7 +184,7 @@ static volatile unsigned long *dir_oe[NUM_PORTS] = { | |||
184 | static unsigned int gpio_poll(struct file *file, struct poll_table_struct *wait) | 184 | static unsigned int gpio_poll(struct file *file, struct poll_table_struct *wait) |
185 | { | 185 | { |
186 | unsigned int mask = 0; | 186 | unsigned int mask = 0; |
187 | struct gpio_private *priv = (struct gpio_private *)file->private_data; | 187 | struct gpio_private *priv = file->private_data; |
188 | unsigned long data; | 188 | unsigned long data; |
189 | poll_wait(file, &priv->alarm_wq, wait); | 189 | poll_wait(file, &priv->alarm_wq, wait); |
190 | if (priv->minor == GPIO_MINOR_A) { | 190 | if (priv->minor == GPIO_MINOR_A) { |
@@ -352,7 +352,7 @@ gpio_pa_interrupt(int irq, void *dev_id) | |||
352 | static ssize_t gpio_write(struct file *file, const char *buf, size_t count, | 352 | static ssize_t gpio_write(struct file *file, const char *buf, size_t count, |
353 | loff_t *off) | 353 | loff_t *off) |
354 | { | 354 | { |
355 | struct gpio_private *priv = (struct gpio_private *)file->private_data; | 355 | struct gpio_private *priv = file->private_data; |
356 | unsigned char data, clk_mask, data_mask, write_msb; | 356 | unsigned char data, clk_mask, data_mask, write_msb; |
357 | unsigned long flags; | 357 | unsigned long flags; |
358 | unsigned long shadow; | 358 | unsigned long shadow; |
@@ -467,7 +467,7 @@ gpio_release(struct inode *inode, struct file *filp) | |||
467 | 467 | ||
468 | spin_lock_irq(&alarm_lock); | 468 | spin_lock_irq(&alarm_lock); |
469 | p = alarmlist; | 469 | p = alarmlist; |
470 | todel = (struct gpio_private *)filp->private_data; | 470 | todel = filp->private_data; |
471 | 471 | ||
472 | if (p == todel) { | 472 | if (p == todel) { |
473 | alarmlist = todel->next; | 473 | alarmlist = todel->next; |
@@ -564,7 +564,7 @@ gpio_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg) | |||
564 | unsigned long flags; | 564 | unsigned long flags; |
565 | unsigned long val; | 565 | unsigned long val; |
566 | unsigned long shadow; | 566 | unsigned long shadow; |
567 | struct gpio_private *priv = (struct gpio_private *)file->private_data; | 567 | struct gpio_private *priv = file->private_data; |
568 | if (_IOC_TYPE(cmd) != ETRAXGPIO_IOCTYPE) | 568 | if (_IOC_TYPE(cmd) != ETRAXGPIO_IOCTYPE) |
569 | return -EINVAL; | 569 | return -EINVAL; |
570 | 570 | ||
@@ -722,7 +722,7 @@ virtual_gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
722 | unsigned long flags; | 722 | unsigned long flags; |
723 | unsigned short val; | 723 | unsigned short val; |
724 | unsigned short shadow; | 724 | unsigned short shadow; |
725 | struct gpio_private *priv = (struct gpio_private *)file->private_data; | 725 | struct gpio_private *priv = file->private_data; |
726 | 726 | ||
727 | switch (_IOC_NR(cmd)) { | 727 | switch (_IOC_NR(cmd)) { |
728 | case IO_SETBITS: | 728 | case IO_SETBITS: |