diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 23:47:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 23:47:25 -0400 |
commit | 2424a7339bdc5468b8a6b3bddd750647e45b314d (patch) | |
tree | ec1e5df7df1a3d54d6cb4952914955b301eaab82 /drivers/extcon/extcon-max77693.c | |
parent | 33b06938cf81939135448ed448ee5aa95fa86d04 (diff) | |
parent | 42d7d7539a7bcf1d493b989465283c464f4a0525 (diff) |
Merge tag 'extcon-next-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
Update extcon for 3.13
This patchset modify extcon core to remove unnecessary allocation sequence for
'dev' instance and change extcon_dev_register() interface. extcon-gpio use
gpiolib API to get debounce time and include small fix of extcon core/device
driver.
Detailed description for patchset:
1. Modify extcon core driver
- The extcon-gpio driver use gpio_set_debounce() API provided from gpiolib
if gpio driver for SoC support gpio_set_debounce() function and support 'gpio_
activ_low' filed to check whether gpio active state is 1(high) or 0(low).
- Change field type of 'dev' in structure extcon_dev and remove the sequence
of allocating memory of 'struct dev' on extcon_dev_register() function because
extcon device must need 'struct device.
- Change extcon_dev_register() prototype to simplify it and remove unnecessary
parameter as below:
2. Fix coding style and typo
- extcon core : Fix indentation coding style and remove unnecessary casting
- extcon-max8997 : Fix checkpatch warning
- extcon-max77693 : Fix checkpatch warning
- extcon-arizona : Fix typo of comment and modify minor issue
- extcon-palmas : Use dev_get_platdata()
3. Modify extcon-arizona driver
- Modify minor issue about micbias and comparision statement
Diffstat (limited to 'drivers/extcon/extcon-max77693.c')
-rw-r--r-- | drivers/extcon/extcon-max77693.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 5ee0344f734d..da268fbc901b 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c | |||
@@ -965,7 +965,7 @@ static void max77693_muic_irq_work(struct work_struct *work) | |||
965 | 965 | ||
966 | mutex_lock(&info->mutex); | 966 | mutex_lock(&info->mutex); |
967 | 967 | ||
968 | for (i = 0 ; i < ARRAY_SIZE(muic_irqs) ; i++) | 968 | for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) |
969 | if (info->irq == muic_irqs[i].virq) | 969 | if (info->irq == muic_irqs[i].virq) |
970 | irq_type = muic_irqs[i].irq; | 970 | irq_type = muic_irqs[i].irq; |
971 | 971 | ||
@@ -1183,8 +1183,9 @@ static int max77693_muic_probe(struct platform_device *pdev) | |||
1183 | goto err_irq; | 1183 | goto err_irq; |
1184 | } | 1184 | } |
1185 | info->edev->name = DEV_NAME; | 1185 | info->edev->name = DEV_NAME; |
1186 | info->edev->dev.parent = &pdev->dev; | ||
1186 | info->edev->supported_cable = max77693_extcon_cable; | 1187 | info->edev->supported_cable = max77693_extcon_cable; |
1187 | ret = extcon_dev_register(info->edev, NULL); | 1188 | ret = extcon_dev_register(info->edev); |
1188 | if (ret) { | 1189 | if (ret) { |
1189 | dev_err(&pdev->dev, "failed to register extcon device\n"); | 1190 | dev_err(&pdev->dev, "failed to register extcon device\n"); |
1190 | goto err_irq; | 1191 | goto err_irq; |
@@ -1200,7 +1201,7 @@ static int max77693_muic_probe(struct platform_device *pdev) | |||
1200 | num_init_data = ARRAY_SIZE(default_init_data); | 1201 | num_init_data = ARRAY_SIZE(default_init_data); |
1201 | } | 1202 | } |
1202 | 1203 | ||
1203 | for (i = 0 ; i < num_init_data ; i++) { | 1204 | for (i = 0; i < num_init_data; i++) { |
1204 | enum max77693_irq_source irq_src | 1205 | enum max77693_irq_source irq_src |
1205 | = MAX77693_IRQ_GROUP_NR; | 1206 | = MAX77693_IRQ_GROUP_NR; |
1206 | 1207 | ||