hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/pinctrl/bcm/pinctrl-ns2-mux.c
....@@ -1042,21 +1042,21 @@
10421042 platform_set_drvdata(pdev, pinctrl);
10431043 spin_lock_init(&pinctrl->lock);
10441044
1045
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1046
- pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res);
1045
+ pinctrl->base0 = devm_platform_ioremap_resource(pdev, 0);
10471046 if (IS_ERR(pinctrl->base0))
10481047 return PTR_ERR(pinctrl->base0);
10491048
10501049 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
1051
- pinctrl->base1 = devm_ioremap_nocache(&pdev->dev, res->start,
1050
+ if (!res)
1051
+ return -EINVAL;
1052
+ pinctrl->base1 = devm_ioremap(&pdev->dev, res->start,
10521053 resource_size(res));
10531054 if (!pinctrl->base1) {
10541055 dev_err(&pdev->dev, "unable to map I/O space\n");
10551056 return -ENOMEM;
10561057 }
10571058
1058
- res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
1059
- pinctrl->pinconf_base = devm_ioremap_resource(&pdev->dev, res);
1059
+ pinctrl->pinconf_base = devm_platform_ioremap_resource(pdev, 2);
10601060 if (IS_ERR(pinctrl->pinconf_base))
10611061 return PTR_ERR(pinctrl->pinconf_base);
10621062