power: supply: axp20x_usb_power: fix warning on 64bit (15df6d98) · Commits · 戴 / test

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: ("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>

drivers/power/supply/axp20x_usb_power.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ struct axp20x_usb_power {
		struct device_node *np;
		struct regmap *regmap;
		struct power_supply *supply;
		int axp20x_id;
		enum axp20x_variants axp20x_id;
		};

		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)
		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->regmap = axp20x->regmap;

include/linux/mfd/axp20x.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@

		#include <linux/regmap.h>

		enum {
		enum axp20x_variants {
		AXP152_ID = 0,
		AXP202_ID,
		AXP209_ID,

Admin message