diff options
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/ab8500_charger.c | 8 | ||||
| -rw-r--r-- | drivers/power/supply/ab8500_fg.c | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index b17d4649210a..d04d087caa50 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -3421,11 +3421,6 @@ static struct platform_driver *const ab8500_charger_component_drivers[] = { &ab8500_chargalg_driver, }; -static int ab8500_charger_compare_dev(struct device *dev, void *data) -{ - return dev == data; -} - static int ab8500_charger_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -3666,8 +3661,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) while ((d = platform_find_device_by_driver(p, drv))) { put_device(p); - component_match_add(dev, &match, - ab8500_charger_compare_dev, d); + component_match_add(dev, &match, component_compare_dev, d); p = d; } put_device(p); diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c index 3ae8086907de..97ac588a9e9c 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2537,10 +2537,11 @@ static struct attribute *ab8500_fg_attrs[] = { &charge_now_attr.attr, NULL, }; +ATTRIBUTE_GROUPS(ab8500_fg); static struct kobj_type ab8500_fg_ktype = { .sysfs_ops = &ab8500_fg_sysfs_ops, - .default_attrs = ab8500_fg_attrs, + .default_groups = ab8500_fg_groups, }; /** |