diff options
Diffstat (limited to 'drivers/staging/vme/devices')
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 14 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c index 3304d92..c64776f 100644 --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c @@ -58,14 +58,14 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset) if (reg & PIO2_CHANNEL_BIT[offset]) { if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH) return 0; - else - return 1; - } else { - if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH) - return 1; - else - return 0; + + return 1; } + + if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH) + return 1; + + return 0; } static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset, diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 920e50a..73cec14 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -482,11 +482,9 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, return -EFAULT; } - retval = vme_irq_generate(vme_user_bridge, + return vme_irq_generate(vme_user_bridge, irq_req.level, irq_req.statid); - - return retval; } break; case MASTER_MINOR: |
