@@ -417,7 +417,7 @@ static void __cpm1_gpio16_set(struct cpm1_gpio16_chip *cpm1_gc, u16 pin_mask, in
417
417
out_be16 (& iop -> dat , cpm1_gc -> cpdata );
418
418
}
419
419
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 )
421
421
{
422
422
struct cpm1_gpio16_chip * cpm1_gc = gpiochip_get_data (gc );
423
423
unsigned long flags ;
@@ -428,6 +428,8 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
428
428
__cpm1_gpio16_set (cpm1_gc , pin_mask , value );
429
429
430
430
spin_unlock_irqrestore (& cpm1_gc -> lock , flags );
431
+
432
+ return 0 ;
431
433
}
432
434
433
435
static int cpm1_gpio16_to_irq (struct gpio_chip * gc , unsigned int gpio )
@@ -497,7 +499,7 @@ int cpm1_gpiochip_add16(struct device *dev)
497
499
gc -> direction_input = cpm1_gpio16_dir_in ;
498
500
gc -> direction_output = cpm1_gpio16_dir_out ;
499
501
gc -> get = cpm1_gpio16_get ;
500
- gc -> set = cpm1_gpio16_set ;
502
+ gc -> set_rv = cpm1_gpio16_set ;
501
503
gc -> to_irq = cpm1_gpio16_to_irq ;
502
504
gc -> parent = dev ;
503
505
gc -> owner = THIS_MODULE ;
@@ -554,7 +556,7 @@ static void __cpm1_gpio32_set(struct cpm1_gpio32_chip *cpm1_gc, u32 pin_mask, in
554
556
out_be32 (& iop -> dat , cpm1_gc -> cpdata );
555
557
}
556
558
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 )
558
560
{
559
561
struct cpm1_gpio32_chip * cpm1_gc = gpiochip_get_data (gc );
560
562
unsigned long flags ;
@@ -565,6 +567,8 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
565
567
__cpm1_gpio32_set (cpm1_gc , pin_mask , value );
566
568
567
569
spin_unlock_irqrestore (& cpm1_gc -> lock , flags );
570
+
571
+ return 0 ;
568
572
}
569
573
570
574
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)
618
622
gc -> direction_input = cpm1_gpio32_dir_in ;
619
623
gc -> direction_output = cpm1_gpio32_dir_out ;
620
624
gc -> get = cpm1_gpio32_get ;
621
- gc -> set = cpm1_gpio32_set ;
625
+ gc -> set_rv = cpm1_gpio32_set ;
622
626
gc -> parent = dev ;
623
627
gc -> owner = THIS_MODULE ;
624
628
0 commit comments