hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
u-boot/drivers/gpio/rk_gpio.c
....@@ -130,7 +130,6 @@
130130 struct rockchip_pinctrl_priv *pctrl_priv;
131131 struct rockchip_pin_bank *bank;
132132 char *end = NULL;
133
- static int gpio;
134133 int id = -1, ret;
135134
136135 priv->regs = dev_read_addr_ptr(dev);
....@@ -152,14 +151,12 @@
152151 end = strrchr(dev->name, '@');
153152 if (end)
154153 id = trailing_strtoln(dev->name, end);
155
- else
154
+ if (id < 0)
156155 dev_read_alias_seq(dev, &id);
157156
158
- if (id < 0)
159
- id = gpio++;
160
-
161
- if (id >= pctrl_priv->ctrl->nr_banks) {
162
- dev_err(dev, "bank id invalid\n");
157
+ if (id < 0 || id >= pctrl_priv->ctrl->nr_banks) {
158
+ dev_err(dev, "nr_banks=%d, bank id=%d invalid\n",
159
+ pctrl_priv->ctrl->nr_banks, id);
163160 return -EINVAL;
164161 }
165162