diff options
author | Krzysztof Kozlowski <k.kozlowski.k@gmail.com> | 2015-07-15 08:59:47 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-16 16:39:29 -0400 |
commit | 0afab670bda6f3c9980be9e6de0effcc2c6d456c (patch) | |
tree | 83de1b33fa49e964b2481ab725915d1c607f09f9 | |
parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) |
mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members
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>
-rw-r--r-- | drivers/extcon/extcon-max77693.c | 19 | ||||
-rw-r--r-- | include/linux/mfd/max77693-private.h | 8 |
2 files changed, 0 insertions, 27 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index f4f3b3d53928..770db3a72a6a 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c | |||
@@ -1164,28 +1164,9 @@ static int max77693_muic_probe(struct platform_device *pdev) | |||
1164 | } | 1164 | } |
1165 | 1165 | ||
1166 | for (i = 0; i < num_init_data; i++) { | 1166 | for (i = 0; i < num_init_data; i++) { |
1167 | enum max77693_irq_source irq_src | ||
1168 | = MAX77693_IRQ_GROUP_NR; | ||
1169 | |||
1170 | regmap_write(info->max77693->regmap_muic, | 1167 | regmap_write(info->max77693->regmap_muic, |
1171 | init_data[i].addr, | 1168 | init_data[i].addr, |
1172 | init_data[i].data); | 1169 | init_data[i].data); |
1173 | |||
1174 | switch (init_data[i].addr) { | ||
1175 | case MAX77693_MUIC_REG_INTMASK1: | ||
1176 | irq_src = MUIC_INT1; | ||
1177 | break; | ||
1178 | case MAX77693_MUIC_REG_INTMASK2: | ||
1179 | irq_src = MUIC_INT2; | ||
1180 | break; | ||
1181 | case MAX77693_MUIC_REG_INTMASK3: | ||
1182 | irq_src = MUIC_INT3; | ||
1183 | break; | ||
1184 | } | ||
1185 | |||
1186 | if (irq_src < MAX77693_IRQ_GROUP_NR) | ||
1187 | info->max77693->irq_masks_cur[irq_src] | ||
1188 | = init_data[i].data; | ||
1189 | } | 1170 | } |
1190 | 1171 | ||
1191 | if (pdata && pdata->muic_data) { | 1172 | if (pdata && pdata->muic_data) { |
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 51633ea6f910..ad67b8235a8d 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h | |||
@@ -547,18 +547,10 @@ struct max77693_dev { | |||
547 | struct regmap_irq_chip_data *irq_data_muic; | 547 | struct regmap_irq_chip_data *irq_data_muic; |
548 | 548 | ||
549 | int irq; | 549 | int irq; |
550 | int irq_gpio; | ||
551 | struct mutex irqlock; | ||
552 | int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; | ||
553 | int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; | ||
554 | }; | 550 | }; |
555 | 551 | ||
556 | enum max77693_types { | 552 | enum max77693_types { |
557 | TYPE_MAX77693, | 553 | TYPE_MAX77693, |
558 | }; | 554 | }; |
559 | 555 | ||
560 | extern int max77693_irq_init(struct max77693_dev *max77686); | ||
561 | extern void max77693_irq_exit(struct max77693_dev *max77686); | ||
562 | extern int max77693_irq_resume(struct max77693_dev *max77686); | ||
563 | |||
564 | #endif /* __LINUX_MFD_MAX77693_PRIV_H */ | 556 | #endif /* __LINUX_MFD_MAX77693_PRIV_H */ |