]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members
authorKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Wed, 15 Jul 2015 12:59:47 +0000 (21:59 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 16 Jul 2015 20:39:29 +0000 (21:39 +0100)
Clean up the max77693 private header file by removing:
1. Left-overs from previous way of interrupt handling (driver uses
   regmap_irq_chip).
2. Unused members of struct 'max77693_dev' related to interrupts in
   extcon driver.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/extcon/extcon-max77693.c
include/linux/mfd/max77693-private.h

index f4f3b3d5392823e145ffa89cf223bd0b45c76892..770db3a72a6a342083e270bf6548b92506e954aa 100644 (file)
@@ -1164,28 +1164,9 @@ static int max77693_muic_probe(struct platform_device *pdev)
        }
 
        for (i = 0; i < num_init_data; i++) {
-               enum max77693_irq_source irq_src
-                               = MAX77693_IRQ_GROUP_NR;
-
                regmap_write(info->max77693->regmap_muic,
                                init_data[i].addr,
                                init_data[i].data);
-
-               switch (init_data[i].addr) {
-               case MAX77693_MUIC_REG_INTMASK1:
-                       irq_src = MUIC_INT1;
-                       break;
-               case MAX77693_MUIC_REG_INTMASK2:
-                       irq_src = MUIC_INT2;
-                       break;
-               case MAX77693_MUIC_REG_INTMASK3:
-                       irq_src = MUIC_INT3;
-                       break;
-               }
-
-               if (irq_src < MAX77693_IRQ_GROUP_NR)
-                       info->max77693->irq_masks_cur[irq_src]
-                               = init_data[i].data;
        }
 
        if (pdata && pdata->muic_data) {
index 51633ea6f9103cbf8f28b89901fcef48e7a7b57a..ad67b8235a8d082a43bec64627a613160c51a410 100644 (file)
@@ -547,18 +547,10 @@ struct max77693_dev {
        struct regmap_irq_chip_data *irq_data_muic;
 
        int irq;
-       int irq_gpio;
-       struct mutex irqlock;
-       int irq_masks_cur[MAX77693_IRQ_GROUP_NR];
-       int irq_masks_cache[MAX77693_IRQ_GROUP_NR];
 };
 
 enum max77693_types {
        TYPE_MAX77693,
 };
 
-extern int max77693_irq_init(struct max77693_dev *max77686);
-extern void max77693_irq_exit(struct max77693_dev *max77686);
-extern int max77693_irq_resume(struct max77693_dev *max77686);
-
 #endif /*  __LINUX_MFD_MAX77693_PRIV_H */