@@ -604,10 +604,9 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d)
604
604
u8 new_irqs ;
605
605
int level , i ;
606
606
u8 invert_irq_mask [MAX_BANK ];
607
- int reg_direction [MAX_BANK ];
607
+ u8 reg_direction [MAX_BANK ];
608
608
609
- regmap_bulk_read (chip -> regmap , chip -> regs -> direction , reg_direction ,
610
- NBANK (chip ));
609
+ pca953x_read_regs (chip , chip -> regs -> direction , reg_direction );
611
610
612
611
if (chip -> driver_data & PCA_PCAL ) {
613
612
/* Enable latch on interrupt-enabled inputs */
@@ -679,7 +678,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
679
678
bool pending_seen = false;
680
679
bool trigger_seen = false;
681
680
u8 trigger [MAX_BANK ];
682
- int reg_direction [MAX_BANK ];
681
+ u8 reg_direction [MAX_BANK ];
683
682
int ret , i ;
684
683
685
684
if (chip -> driver_data & PCA_PCAL ) {
@@ -710,8 +709,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending)
710
709
return false;
711
710
712
711
/* Remove output pins from the equation */
713
- regmap_bulk_read (chip -> regmap , chip -> regs -> direction , reg_direction ,
714
- NBANK (chip ));
712
+ pca953x_read_regs (chip , chip -> regs -> direction , reg_direction );
715
713
for (i = 0 ; i < NBANK (chip ); i ++ )
716
714
cur_stat [i ] &= reg_direction [i ];
717
715
@@ -768,7 +766,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
768
766
{
769
767
struct i2c_client * client = chip -> client ;
770
768
struct irq_chip * irq_chip = & chip -> irq_chip ;
771
- int reg_direction [MAX_BANK ];
769
+ u8 reg_direction [MAX_BANK ];
772
770
int ret , i ;
773
771
774
772
if (!client -> irq )
@@ -789,8 +787,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
789
787
* interrupt. We have to rely on the previous read for
790
788
* this purpose.
791
789
*/
792
- regmap_bulk_read (chip -> regmap , chip -> regs -> direction , reg_direction ,
793
- NBANK (chip ));
790
+ pca953x_read_regs (chip , chip -> regs -> direction , reg_direction );
794
791
for (i = 0 ; i < NBANK (chip ); i ++ )
795
792
chip -> irq_stat [i ] &= reg_direction [i ];
796
793
mutex_init (& chip -> irq_lock );
0 commit comments