Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e593beaf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

phy: ralink: fix 64-bit build warning 



Casting between an 'int' and a pointer causes a warning on
64-bit architectures in compile-testing this driver:

drivers/phy/ralink/phy-ralink-usb.c: In function 'ralink_usb_phy_probe':
drivers/phy/ralink/phy-ralink-usb.c:195:13: error: cast from pointer to
integer of different size [-Werror=pointer-to-int-cast]

This changes the code to cast to uintptr_t instead. This is
guaranteed to do what we want on all architectures and avoids
the warning.

Fixes: 2411a736 ("phy: ralink-usb: add driver for Mediatek/Ralink")
Acked-by: default avatarJohn Crispin <john@phrozen.org>
Tested-by Harvey Hunt <harvey.hunt@imgtec.com>
Reviewed-by Harvey Hunt <harvey.hunt@imgtec.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cad2be29

drivers/phy/ralink/phy-ralink-usb.c

+7 −7
Original line number Diff line number Diff line
@@ -160,17 +160,17 @@ static struct phy_ops ralink_usb_phy_ops = { 
static const struct of_device_id ralink_usb_phy_of_match[] = {

	{

		.compatible = "ralink,rt3352-usbphy",

		.data = (void *) (RT_CLKCFG1_UPHY1_CLK_EN |

		.data = (void *)(uintptr_t)(RT_CLKCFG1_UPHY1_CLK_EN |

					    RT_CLKCFG1_UPHY0_CLK_EN)

	},

	{

		.compatible = "mediatek,mt7620-usbphy",

		.data = (void *) (MT7620_CLKCFG1_UPHY1_CLK_EN |

		.data = (void *)(uintptr_t)(MT7620_CLKCFG1_UPHY1_CLK_EN |

					    MT7620_CLKCFG1_UPHY0_CLK_EN)

	},

	{

		.compatible = "mediatek,mt7628-usbphy",

		.data = (void *) (MT7620_CLKCFG1_UPHY1_CLK_EN |

		.data = (void *)(uintptr_t)(MT7620_CLKCFG1_UPHY1_CLK_EN |

					    MT7620_CLKCFG1_UPHY0_CLK_EN) },

	{ },

};
@@ -192,7 +192,7 @@ static int ralink_usb_phy_probe(struct platform_device *pdev) 
	if (!phy)

		return -ENOMEM;



	phy->clk = (u32) match->data;

	phy->clk = (uintptr_t)match->data;

	phy->base = NULL;



	phy->sysctl = syscon_regmap_lookup_by_phandle(dev->of_node, "ralink,sysctl");