| Message ID | 20161125090921.23138-2-quentin.schulz@free-electrons.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Nov 25, 2016 at 5:09 PM, Quentin Schulz <quentin.schulz@free-electrons.com> wrote: > This replaces calls to of_device_is_compatible to check data field of > of_device_id matched when probing the driver. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> > --- > drivers/power/supply/axp20x_usb_power.c | 39 ++++++++++++++++++++------------- > 1 file changed, 24 insertions(+), 15 deletions(-) > > diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c > index 6af6feb..b19754e 100644 > --- a/drivers/power/supply/axp20x_usb_power.c > +++ b/drivers/power/supply/axp20x_usb_power.c > @@ -17,6 +17,7 @@ > #include <linux/mfd/axp20x.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/power_supply.h> > #include <linux/regmap.h> > @@ -45,6 +46,7 @@ struct axp20x_usb_power { > struct device_node *np; > struct regmap *regmap; > struct power_supply *supply; > + int axp20x_id; > }; > > static irqreturn_t axp20x_usb_power_irq(int irq, void *devid) > @@ -86,8 +88,7 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, > > switch (v & AXP20X_VBUS_CLIMIT_MASK) { > case AXP20X_VBUC_CLIMIT_100mA: > - if (of_device_is_compatible(power->np, > - "x-powers,axp202-usb-power-supply")) { > + if (power->axp20x_id == AXP202_ID) { > val->intval = 100000; > } else { > val->intval = -1; /* No 100mA limit */ > @@ -130,8 +131,7 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, > > val->intval = POWER_SUPPLY_HEALTH_GOOD; > > - if (of_device_is_compatible(power->np, > - "x-powers,axp202-usb-power-supply")) { > + if (power->axp20x_id == AXP202_ID) { > ret = regmap_read(power->regmap, > AXP20X_USB_OTG_STATUS, &v); > if (ret) > @@ -189,6 +189,17 @@ static const struct power_supply_desc axp22x_usb_power_desc = { > .get_property = axp20x_usb_power_get_property, > }; > > +static const struct of_device_id axp20x_usb_power_match[] = { > + { > + .compatible = "x-powers,axp202-usb-power-supply", > + .data = (void *)AXP202_ID, > + }, { > + .compatible = "x-powers,axp221-usb-power-supply", > + .data = (void *)AXP221_ID, > + }, { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, axp20x_usb_power_match); > + There's no need to move this. See why below. > static int axp20x_usb_power_probe(struct platform_device *pdev) > { > struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); > @@ -200,11 +211,16 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) > "VBUS_PLUGIN", "VBUS_REMOVAL", NULL }; > static const char * const *irq_names; > const struct power_supply_desc *usb_power_desc; > + const struct of_device_id *of_id; > int i, irq, ret; > > if (!of_device_is_available(pdev->dev.of_node)) > return -ENODEV; > > + of_id = of_match_device(axp20x_usb_power_match, &pdev->dev); > + if (!of_id) > + return -ENODEV; > + You can use of_device_get_match_data() instead. ChenYu > if (!axp20x) { > dev_err(&pdev->dev, "Parent drvdata not set\n"); > return -EINVAL; > @@ -214,11 +230,12 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) > if (!power) > return -ENOMEM; > > + power->axp20x_id = (int)of_id->data; > + > power->np = pdev->dev.of_node; > power->regmap = axp20x->regmap; > > - if (of_device_is_compatible(power->np, > - "x-powers,axp202-usb-power-supply")) { > + if (power->axp20x_id == AXP202_ID) { > /* Enable vbus valid checking */ > ret = regmap_update_bits(power->regmap, AXP20X_VBUS_MON, > AXP20X_VBUS_MON_VBUS_VALID, > @@ -235,8 +252,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) > > usb_power_desc = &axp20x_usb_power_desc; > irq_names = axp20x_irq_names; > - } else if (of_device_is_compatible(power->np, > - "x-powers,axp221-usb-power-supply")) { > + } else if (power->axp20x_id == AXP221_ID) { > usb_power_desc = &axp22x_usb_power_desc; > irq_names = axp22x_irq_names; > } else { > @@ -272,13 +288,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id axp20x_usb_power_match[] = { > - { .compatible = "x-powers,axp202-usb-power-supply" }, > - { .compatible = "x-powers,axp221-usb-power-supply" }, > - { } > -}; > -MODULE_DEVICE_TABLE(of, axp20x_usb_power_match); > - > static struct platform_driver axp20x_usb_power_driver = { > .probe = axp20x_usb_power_probe, > .driver = { > -- > 2.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Quentin,
[auto build test WARNING on robh/for-next]
[also build test WARNING on v4.9-rc6 next-20161124]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Quentin-Schulz/add-support-for-VBUS-max-current-and-min-voltage-limits-AXP20X-and-AXP22X-PMICs/20161125-172224
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
config: x86_64-randconfig-s5-11251757 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
drivers/power/supply/axp20x_usb_power.c: In function 'axp20x_usb_power_probe':
>> drivers/power/supply/axp20x_usb_power.c:233:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
power->axp20x_id = (int)of_id->data;
^
vim +233 drivers/power/supply/axp20x_usb_power.c
217 if (!of_device_is_available(pdev->dev.of_node))
218 return -ENODEV;
219
220 of_id = of_match_device(axp20x_usb_power_match, &pdev->dev);
221 if (!of_id)
222 return -ENODEV;
223
224 if (!axp20x) {
225 dev_err(&pdev->dev, "Parent drvdata not set\n");
226 return -EINVAL;
227 }
228
229 power = devm_kzalloc(&pdev->dev, sizeof(*power), GFP_KERNEL);
230 if (!power)
231 return -ENOMEM;
232
> 233 power->axp20x_id = (int)of_id->data;
234
235 power->np = pdev->dev.of_node;
236 power->regmap = axp20x->regmap;
237
238 if (power->axp20x_id == AXP202_ID) {
239 /* Enable vbus valid checking */
240 ret = regmap_update_bits(power->regmap, AXP20X_VBUS_MON,
241 AXP20X_VBUS_MON_VBUS_VALID,
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c index 6af6feb..b19754e 100644 --- a/drivers/power/supply/axp20x_usb_power.c +++ b/drivers/power/supply/axp20x_usb_power.c @@ -17,6 +17,7 @@ #include <linux/mfd/axp20x.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/regmap.h> @@ -45,6 +46,7 @@ struct axp20x_usb_power { struct device_node *np; struct regmap *regmap; struct power_supply *supply; + int axp20x_id; }; static irqreturn_t axp20x_usb_power_irq(int irq, void *devid) @@ -86,8 +88,7 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, switch (v & AXP20X_VBUS_CLIMIT_MASK) { case AXP20X_VBUC_CLIMIT_100mA: - if (of_device_is_compatible(power->np, - "x-powers,axp202-usb-power-supply")) { + if (power->axp20x_id == AXP202_ID) { val->intval = 100000; } else { val->intval = -1; /* No 100mA limit */ @@ -130,8 +131,7 @@ static int axp20x_usb_power_get_property(struct power_supply *psy, val->intval = POWER_SUPPLY_HEALTH_GOOD; - if (of_device_is_compatible(power->np, - "x-powers,axp202-usb-power-supply")) { + if (power->axp20x_id == AXP202_ID) { ret = regmap_read(power->regmap, AXP20X_USB_OTG_STATUS, &v); if (ret) @@ -189,6 +189,17 @@ static const struct power_supply_desc axp22x_usb_power_desc = { .get_property = axp20x_usb_power_get_property, }; +static const struct of_device_id axp20x_usb_power_match[] = { + { + .compatible = "x-powers,axp202-usb-power-supply", + .data = (void *)AXP202_ID, + }, { + .compatible = "x-powers,axp221-usb-power-supply", + .data = (void *)AXP221_ID, + }, { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, axp20x_usb_power_match); + static int axp20x_usb_power_probe(struct platform_device *pdev) { struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); @@ -200,11 +211,16 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) "VBUS_PLUGIN", "VBUS_REMOVAL", NULL }; static const char * const *irq_names; const struct power_supply_desc *usb_power_desc; + const struct of_device_id *of_id; int i, irq, ret; if (!of_device_is_available(pdev->dev.of_node)) return -ENODEV; + of_id = of_match_device(axp20x_usb_power_match, &pdev->dev); + if (!of_id) + return -ENODEV; + if (!axp20x) { dev_err(&pdev->dev, "Parent drvdata not set\n"); return -EINVAL; @@ -214,11 +230,12 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) if (!power) return -ENOMEM; + power->axp20x_id = (int)of_id->data; + power->np = pdev->dev.of_node; power->regmap = axp20x->regmap; - if (of_device_is_compatible(power->np, - "x-powers,axp202-usb-power-supply")) { + if (power->axp20x_id == AXP202_ID) { /* Enable vbus valid checking */ ret = regmap_update_bits(power->regmap, AXP20X_VBUS_MON, AXP20X_VBUS_MON_VBUS_VALID, @@ -235,8 +252,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) usb_power_desc = &axp20x_usb_power_desc; irq_names = axp20x_irq_names; - } else if (of_device_is_compatible(power->np, - "x-powers,axp221-usb-power-supply")) { + } else if (power->axp20x_id == AXP221_ID) { usb_power_desc = &axp22x_usb_power_desc; irq_names = axp22x_irq_names; } else { @@ -272,13 +288,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id axp20x_usb_power_match[] = { - { .compatible = "x-powers,axp202-usb-power-supply" }, - { .compatible = "x-powers,axp221-usb-power-supply" }, - { } -}; -MODULE_DEVICE_TABLE(of, axp20x_usb_power_match); - static struct platform_driver axp20x_usb_power_driver = { .probe = axp20x_usb_power_probe, .driver = {
This replaces calls to of_device_is_compatible to check data field of of_device_id matched when probing the driver. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> --- drivers/power/supply/axp20x_usb_power.c | 39 ++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 15 deletions(-)