|
@@ -37,14 +37,14 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
|
|
|
struct pio2_card *card = gpio_to_pio2_card(chip);
|
|
|
|
|
|
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
|
|
|
- (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
+ (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
|
|
|
dev_err(&card->vdev->dev, "Channel not available as input\n");
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
retval = vme_master_read(card->window, ®, 1,
|
|
|
- PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
|
|
|
+ PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
|
|
|
if (retval < 0) {
|
|
|
dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
|
|
|
return 0;
|
|
@@ -67,15 +67,15 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
|
|
|
- int value)
|
|
|
+static void pio2_gpio_set(struct gpio_chip *chip,
|
|
|
+ unsigned int offset, int value)
|
|
|
{
|
|
|
u8 reg;
|
|
|
int retval;
|
|
|
struct pio2_card *card = gpio_to_pio2_card(chip);
|
|
|
|
|
|
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
|
|
|
- (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
+ (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
|
|
|
dev_err(&card->vdev->dev, "Channel not available as output\n");
|
|
|
return;
|
|
@@ -89,7 +89,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
|
|
|
~PIO2_CHANNEL_BIT[offset];
|
|
|
|
|
|
retval = vme_master_write(card->window, ®, 1,
|
|
|
- PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
|
|
|
+ PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
|
|
|
if (retval < 0) {
|
|
|
dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
|
|
|
return;
|
|
@@ -105,7 +105,7 @@ static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
|
|
|
struct pio2_card *card = gpio_to_pio2_card(chip);
|
|
|
|
|
|
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
|
|
|
- (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
+ (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
dev_err(&card->vdev->dev,
|
|
|
"Channel directionality not configurable at runtime\n");
|
|
|
|
|
@@ -124,7 +124,7 @@ static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
|
|
|
struct pio2_card *card = gpio_to_pio2_card(chip);
|
|
|
|
|
|
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
|
|
|
- (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
+ (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
|
|
|
dev_err(&card->vdev->dev,
|
|
|
"Channel directionality not configurable at runtime\n");
|
|
|
|
|
@@ -150,7 +150,7 @@ int pio2_gpio_reset(struct pio2_card *card)
|
|
|
/* Zero output registers */
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
retval = vme_master_write(card->window, &data, 1,
|
|
|
- PIO2_REGS_DATA[i]);
|
|
|
+ PIO2_REGS_DATA[i]);
|
|
|
if (retval < 0)
|
|
|
return retval;
|
|
|
card->bank[i].value = 0;
|
|
@@ -159,12 +159,12 @@ int pio2_gpio_reset(struct pio2_card *card)
|
|
|
/* Set input interrupt masks */
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
retval = vme_master_write(card->window, &data, 1,
|
|
|
- PIO2_REGS_INT_MASK[i * 2]);
|
|
|
+ PIO2_REGS_INT_MASK[i * 2]);
|
|
|
if (retval < 0)
|
|
|
return retval;
|
|
|
|
|
|
retval = vme_master_write(card->window, &data, 1,
|
|
|
- PIO2_REGS_INT_MASK[(i * 2) + 1]);
|
|
|
+ PIO2_REGS_INT_MASK[(i * 2) + 1]);
|
|
|
if (retval < 0)
|
|
|
return retval;
|
|
|
|
|
@@ -176,7 +176,7 @@ int pio2_gpio_reset(struct pio2_card *card)
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
do {
|
|
|
retval = vme_master_read(card->window, &data, 1,
|
|
|
- PIO2_REGS_INT_STAT[i]);
|
|
|
+ PIO2_REGS_INT_STAT[i]);
|
|
|
if (retval < 0)
|
|
|
return retval;
|
|
|
} while (data != 0);
|