UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

power: supply: axp20x_usb_power: fix warning on 64bit 

Casting of_device_get_match_data return value to int causes warning on 64bit
architectures.

../drivers/power/supply/axp20x_usb_power.c: In function
'axp20x_usb_power_probe':
../drivers/power/supply/axp20x_usb_power.c:297:21: warning: cast from
pointer to integer of different size [-Wpointer-to-int-cast]

Fixes: 0dcc70ca86 ("power: supply: axp20x_usb_power: use of_device_id
    data field instead of device_is_compatible")
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Michal Suchanek 2017-01-10 18:48:12 +01:00 committed by Sebastian Reichel
parent e839a44881
commit 15df6d98ec
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/power/supply/axp20x_usb_power.c
View File

@ -48,7 +48,7 @@ struct axp20x_usb_power {
struct device_node *np; struct device_node *np;
struct regmap *regmap; struct regmap *regmap;
struct power_supply *supply; struct power_supply *supply;
int axp20x_id; enum axp20x_variants axp20x_id;
}; };
static irqreturn_t axp20x_usb_power_irq(int irq, void *devid) static irqreturn_t axp20x_usb_power_irq(int irq, void *devid)
@ -294,7 +294,8 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
if (!power) if (!power)
return -ENOMEM; return -ENOMEM;
power->axp20x_id = (int)of_device_get_match_data(&pdev->dev); power->axp20x_id = (enum axp20x_variants)of_device_get_match_data(
&pdev->dev);
power->np = pdev->dev.of_node; power->np = pdev->dev.of_node;
power->regmap = axp20x->regmap; power->regmap = axp20x->regmap;

2
include/linux/mfd/axp20x.h
View File

@ -13,7 +13,7 @@
#include <linux/regmap.h> #include <linux/regmap.h>
enum { enum axp20x_variants {
AXP152_ID = 0, AXP152_ID = 0,
AXP202_ID, AXP202_ID,
AXP209_ID, AXP209_ID,