hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/pinctrl/bcm/pinctrl-cygnus-mux.c
....@@ -923,7 +923,6 @@
923923 if (!pinctrl->mux_log)
924924 return -ENOMEM;
925925
926
- log = pinctrl->mux_log;
927926 for (i = 0; i < CYGNUS_NUM_IOMUX_REGS; i++) {
928927 for (j = 0; j < CYGNUS_NUM_MUX_PER_REG; j++) {
929928 log = &pinctrl->mux_log[i * CYGNUS_NUM_MUX_PER_REG
....@@ -941,7 +940,6 @@
941940 static int cygnus_pinmux_probe(struct platform_device *pdev)
942941 {
943942 struct cygnus_pinctrl *pinctrl;
944
- struct resource *res;
945943 int i, ret;
946944 struct pinctrl_pin_desc *pins;
947945 unsigned num_pins = ARRAY_SIZE(cygnus_pins);
....@@ -954,15 +952,13 @@
954952 platform_set_drvdata(pdev, pinctrl);
955953 spin_lock_init(&pinctrl->lock);
956954
957
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
958
- pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res);
955
+ pinctrl->base0 = devm_platform_ioremap_resource(pdev, 0);
959956 if (IS_ERR(pinctrl->base0)) {
960957 dev_err(&pdev->dev, "unable to map I/O space\n");
961958 return PTR_ERR(pinctrl->base0);
962959 }
963960
964
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
965
- pinctrl->base1 = devm_ioremap_resource(&pdev->dev, res);
961
+ pinctrl->base1 = devm_platform_ioremap_resource(pdev, 1);
966962 if (IS_ERR(pinctrl->base1)) {
967963 dev_err(&pdev->dev, "unable to map I/O space\n");
968964 return PTR_ERR(pinctrl->base1);