gpio: dwapb: remove name from dwapb_port_property
This patch removed the name property from dwapb_port_property. The name property is redundant, since we can get this info from dwapb_gpio dev node. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Jiang Qiu <qiujiang@huawei.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
a8fa91a74f
commit
e81591815d
|
@ -409,8 +409,8 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
|
|||
err = bgpio_init(&port->gc, gpio->dev, 4, dat, set, NULL, dirout,
|
||||
NULL, false);
|
||||
if (err) {
|
||||
dev_err(gpio->dev, "failed to init gpio chip for %s\n",
|
||||
pp->name);
|
||||
dev_err(gpio->dev, "failed to init gpio chip for port%d\n",
|
||||
port->idx);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -429,8 +429,8 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
|
|||
|
||||
err = gpiochip_add_data(&port->gc, port);
|
||||
if (err)
|
||||
dev_err(gpio->dev, "failed to register gpiochip for %s\n",
|
||||
pp->name);
|
||||
dev_err(gpio->dev, "failed to register gpiochip for port%d\n",
|
||||
port->idx);
|
||||
else
|
||||
port->is_registered = true;
|
||||
|
||||
|
@ -480,15 +480,16 @@ dwapb_gpio_get_pdata_of(struct device *dev)
|
|||
|
||||
if (of_property_read_u32(port_np, "reg", &pp->idx) ||
|
||||
pp->idx >= DWAPB_MAX_PORTS) {
|
||||
dev_err(dev, "missing/invalid port index for %s\n",
|
||||
port_np->full_name);
|
||||
dev_err(dev,
|
||||
"missing/invalid port index for port%d\n", i);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
if (of_property_read_u32(port_np, "snps,nr-gpios",
|
||||
&pp->ngpio)) {
|
||||
dev_info(dev, "failed to get number of gpios for %s\n",
|
||||
port_np->full_name);
|
||||
dev_info(dev,
|
||||
"failed to get number of gpios for port%d\n",
|
||||
i);
|
||||
pp->ngpio = 32;
|
||||
}
|
||||
|
||||
|
@ -499,15 +500,12 @@ dwapb_gpio_get_pdata_of(struct device *dev)
|
|||
if (pp->idx == 0 &&
|
||||
of_property_read_bool(port_np, "interrupt-controller")) {
|
||||
pp->irq = irq_of_parse_and_map(port_np, 0);
|
||||
if (!pp->irq) {
|
||||
dev_warn(dev, "no irq for bank %s\n",
|
||||
port_np->full_name);
|
||||
}
|
||||
if (!pp->irq)
|
||||
dev_warn(dev, "no irq for port%d\n", pp->idx);
|
||||
}
|
||||
|
||||
pp->irq_shared = false;
|
||||
pp->gpio_base = -1;
|
||||
pp->name = port_np->full_name;
|
||||
}
|
||||
|
||||
return pdata;
|
||||
|
|
|
@ -220,7 +220,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
|
|||
|
||||
/* Set the properties for portA */
|
||||
pdata->properties->node = NULL;
|
||||
pdata->properties->name = "intel-quark-x1000-gpio-portA";
|
||||
pdata->properties->idx = 0;
|
||||
pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO;
|
||||
pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE;
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
struct dwapb_port_property {
|
||||
struct device_node *node;
|
||||
const char *name;
|
||||
unsigned int idx;
|
||||
unsigned int ngpio;
|
||||
unsigned int gpio_base;
|
||||
|
|
Loading…
Reference in New Issue