diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 10:05:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 10:05:27 -0700 |
| commit | 1b3fa22e0234d613df967445cd34807e10fa54fa (patch) | |
| tree | 8891a1d1f5d10416d32f15dbcee098b9572d079f /drivers/extcon/extcon-palmas.c | |
| parent | a05f8f86e49749f239c49257db1d3ac6f474f0dd (diff) | |
| parent | 1ad94ffef22c0a6e2ee6ba90a800c32fd29ffa1f (diff) | |
| download | linux-1b3fa22e0234d613df967445cd34807e10fa54fa.tar.gz linux-1b3fa22e0234d613df967445cd34807e10fa54fa.tar.bz2 linux-1b3fa22e0234d613df967445cd34807e10fa54fa.zip | |
Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
Update extcon for v3.15
This patchset fix minor issue.
The extcon-palmas/gpio use SIMPLE_DEV_PM_OPS macro instead of legacy method.
OF helper function of extcon move in extcon core to remove separate of_extcon.c
and change the name of OF helper function as following because previous function
name is complicated and ambiguous naming.
- of_extcon_get_extcon_dev() -> extcon_get_edev_by_phandle()
Diffstat (limited to 'drivers/extcon/extcon-palmas.c')
| -rw-r--r-- | drivers/extcon/extcon-palmas.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 2aea4bcdd7f3..ddff2b72f0a8 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -271,10 +271,7 @@ static int palmas_usb_resume(struct device *dev) }; #endif -static const struct dev_pm_ops palmas_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(palmas_usb_suspend, - palmas_usb_resume) -}; +static SIMPLE_DEV_PM_OPS(palmas_pm_ops, palmas_usb_suspend, palmas_usb_resume); static struct of_device_id of_palmas_match_tbl[] = { { .compatible = "ti,palmas-usb", }, |