Skip to content

Commit 5ea6a98

Browse files
Bartosz Golaszewskimaddy-kerneldev
authored andcommitted
powerpc: 8xx/gpio: use new line value setter callbacks
struct gpio_chip now has callbacks for setting line values that return an integer, allowing to indicate failures. Convert the driver to using them. Reviewed-by: Linus Walleij <[email protected]> Reviewed-by: Christophe Leroy <[email protected]> Acked-by: Christophe Leroy <[email protected]> # powerpc 8xx Signed-off-by: Bartosz Golaszewski <[email protected]> Signed-off-by: Madhavan Srinivasan <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent c8fb184 commit 5ea6a98

File tree

1 file changed

+8
-4
lines changed
  • arch/powerpc/platforms/8xx

1 file changed

+8
-4
lines changed

arch/powerpc/platforms/8xx/cpm1.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static void __cpm1_gpio16_set(struct cpm1_gpio16_chip *cpm1_gc, u16 pin_mask, in
417417
out_be16(&iop->dat, cpm1_gc->cpdata);
418418
}
419419

420-
static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
420+
static int cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
421421
{
422422
struct cpm1_gpio16_chip *cpm1_gc = gpiochip_get_data(gc);
423423
unsigned long flags;
@@ -428,6 +428,8 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
428428
__cpm1_gpio16_set(cpm1_gc, pin_mask, value);
429429

430430
spin_unlock_irqrestore(&cpm1_gc->lock, flags);
431+
432+
return 0;
431433
}
432434

433435
static int cpm1_gpio16_to_irq(struct gpio_chip *gc, unsigned int gpio)
@@ -497,7 +499,7 @@ int cpm1_gpiochip_add16(struct device *dev)
497499
gc->direction_input = cpm1_gpio16_dir_in;
498500
gc->direction_output = cpm1_gpio16_dir_out;
499501
gc->get = cpm1_gpio16_get;
500-
gc->set = cpm1_gpio16_set;
502+
gc->set_rv = cpm1_gpio16_set;
501503
gc->to_irq = cpm1_gpio16_to_irq;
502504
gc->parent = dev;
503505
gc->owner = THIS_MODULE;
@@ -554,7 +556,7 @@ static void __cpm1_gpio32_set(struct cpm1_gpio32_chip *cpm1_gc, u32 pin_mask, in
554556
out_be32(&iop->dat, cpm1_gc->cpdata);
555557
}
556558

557-
static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
559+
static int cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
558560
{
559561
struct cpm1_gpio32_chip *cpm1_gc = gpiochip_get_data(gc);
560562
unsigned long flags;
@@ -565,6 +567,8 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
565567
__cpm1_gpio32_set(cpm1_gc, pin_mask, value);
566568

567569
spin_unlock_irqrestore(&cpm1_gc->lock, flags);
570+
571+
return 0;
568572
}
569573

570574
static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
@@ -618,7 +622,7 @@ int cpm1_gpiochip_add32(struct device *dev)
618622
gc->direction_input = cpm1_gpio32_dir_in;
619623
gc->direction_output = cpm1_gpio32_dir_out;
620624
gc->get = cpm1_gpio32_get;
621-
gc->set = cpm1_gpio32_set;
625+
gc->set_rv = cpm1_gpio32_set;
622626
gc->parent = dev;
623627
gc->owner = THIS_MODULE;
624628

0 commit comments

Comments
 (0)