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

Commit c3dd25cc authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

pinctrl: fix qcom ssbi drivers for 64-bit compilation 



When building pinctrl-ssbi-gpio and pinctrl-ssbi-mpp for ARM64, we get
a compile warning about invalid types:

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c: In function 'pm8xxx_gpio_probe':
drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c:675:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c: In function 'pm8xxx_mpp_probe':
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c:766:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

This changes the code so we cast the pointer to 'unsigned long', which
is the right thing to do here.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0563df2c

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev) 
		return -ENOMEM;



	pctrl->dev = &pdev->dev;

	pctrl->npins = (unsigned)of_device_get_match_data(&pdev->dev);

	pctrl->npins = (unsigned long)of_device_get_match_data(&pdev->dev);



	pctrl->regmap = dev_get_regmap(pdev->dev.parent, NULL);

	if (!pctrl->regmap) {

drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev) 
		return -ENOMEM;



	pctrl->dev = &pdev->dev;

	pctrl->npins = (unsigned)of_device_get_match_data(&pdev->dev);

	pctrl->npins = (unsigned long)of_device_get_match_data(&pdev->dev);



	pctrl->regmap = dev_get_regmap(pdev->dev.parent, NULL);

	if (!pctrl->regmap) {