aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/phy/ralink/phy-ralink-usb.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-24 13:19:08 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-24 17:26:50 -0700
commite593beaf60e003c4e0d65e6ea9ceb75c2971afbc (patch)
tree45373535747f49b41746e175f7f2db70f0f4fe6b /drivers/phy/ralink/phy-ralink-usb.c
parentcad2be29978df5d27475890c153f20b8ee9f41d1 (diff)
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: 2411a736ff09 ("phy: ralink-usb: add driver for Mediatek/Ralink") Acked-by: John Crispin <john@phrozen.org> Tested-by Harvey Hunt <harvey.hunt@imgtec.com> Reviewed-by Harvey Hunt <harvey.hunt@imgtec.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy/ralink/phy-ralink-usb.c')
-rw-r--r--drivers/phy/ralink/phy-ralink-usb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/phy/ralink/phy-ralink-usb.c b/drivers/phy/ralink/phy-ralink-usb.c
index d19088c0ce5c..4fea31f8ac1c 100644
--- a/drivers/phy/ralink/phy-ralink-usb.c
+++ b/drivers/phy/ralink/phy-ralink-usb.c
@@ -160,18 +160,18 @@ 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 |
- RT_CLKCFG1_UPHY0_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 |
- MT7620_CLKCFG1_UPHY0_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 |
- MT7620_CLKCFG1_UPHY0_CLK_EN) },
+ .data = (void *)(uintptr_t)(MT7620_CLKCFG1_UPHY1_CLK_EN |
+ MT7620_CLKCFG1_UPHY0_CLK_EN) },
{ },
};
MODULE_DEVICE_TABLE(of, ralink_usb_phy_of_match);
@@ -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");

Privacy Policy