Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 207115
b: refs/heads/master
c: 16bc0fe
h: refs/heads/master
i:
  207113: a58d77a
  207111: 215dab5
v: v3
  • Loading branch information
Joe Perches authored and Jesper Nilsson committed Aug 4, 2010
1 parent e7fd778 commit 3467fb2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 096b7bdc8663c16417ff5fbec42622302e6886e1
refs/heads/master: 16bc0fe5ce84df89c8e802be210af88721d4cc4f
10 changes: 5 additions & 5 deletions trunk/arch/cris/arch-v32/drivers/mach-fs/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static volatile unsigned long *dir_oe[NUM_PORTS] = {
static unsigned int gpio_poll(struct file *file, struct poll_table_struct *wait)
{
unsigned int mask = 0;
struct gpio_private *priv = (struct gpio_private *)file->private_data;
struct gpio_private *priv = file->private_data;
unsigned long data;
poll_wait(file, &priv->alarm_wq, wait);
if (priv->minor == GPIO_MINOR_A) {
Expand Down Expand Up @@ -352,7 +352,7 @@ gpio_pa_interrupt(int irq, void *dev_id)
static ssize_t gpio_write(struct file *file, const char *buf, size_t count,
loff_t *off)
{
struct gpio_private *priv = (struct gpio_private *)file->private_data;
struct gpio_private *priv = file->private_data;
unsigned char data, clk_mask, data_mask, write_msb;
unsigned long flags;
unsigned long shadow;
Expand Down Expand Up @@ -467,7 +467,7 @@ gpio_release(struct inode *inode, struct file *filp)

spin_lock_irq(&alarm_lock);
p = alarmlist;
todel = (struct gpio_private *)filp->private_data;
todel = filp->private_data;

if (p == todel) {
alarmlist = todel->next;
Expand Down Expand Up @@ -564,7 +564,7 @@ gpio_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long arg)
unsigned long flags;
unsigned long val;
unsigned long shadow;
struct gpio_private *priv = (struct gpio_private *)file->private_data;
struct gpio_private *priv = file->private_data;
if (_IOC_TYPE(cmd) != ETRAXGPIO_IOCTYPE)
return -EINVAL;

Expand Down Expand Up @@ -722,7 +722,7 @@ virtual_gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned long flags;
unsigned short val;
unsigned short shadow;
struct gpio_private *priv = (struct gpio_private *)file->private_data;
struct gpio_private *priv = file->private_data;

switch (_IOC_NR(cmd)) {
case IO_SETBITS:
Expand Down

0 comments on commit 3467fb2

Please sign in to comment.