openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Jiang Qiu 2016-04-28 17:32:01 +08:00 committed by Linus Walleij
parent a8fa91a74f
commit e81591815d
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpio/gpio-dwapb.c
View File

@ -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, err = bgpio_init(&port->gc, gpio->dev, 4, dat, set, NULL, dirout,
NULL, false); NULL, false);
if (err) { if (err) {
dev_err(gpio->dev, "failed to init gpio chip for %s\n", dev_err(gpio->dev, "failed to init gpio chip for port%d\n",
pp->name); port->idx);
return err; return err;
} }
@ -429,8 +429,8 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
err = gpiochip_add_data(&port->gc, port); err = gpiochip_add_data(&port->gc, port);
if (err) if (err)
dev_err(gpio->dev, "failed to register gpiochip for %s\n", dev_err(gpio->dev, "failed to register gpiochip for port%d\n",
pp->name); port->idx);
else else
port->is_registered = true; 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) || if (of_property_read_u32(port_np, "reg", &pp->idx) ||
pp->idx >= DWAPB_MAX_PORTS) { pp->idx >= DWAPB_MAX_PORTS) {
dev_err(dev, "missing/invalid port index for %s\n", dev_err(dev,
port_np->full_name); "missing/invalid port index for port%d\n", i);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
if (of_property_read_u32(port_np, "snps,nr-gpios", if (of_property_read_u32(port_np, "snps,nr-gpios",
&pp->ngpio)) { &pp->ngpio)) {
dev_info(dev, "failed to get number of gpios for %s\n", dev_info(dev,
port_np->full_name); "failed to get number of gpios for port%d\n",
i);
pp->ngpio = 32; pp->ngpio = 32;
} }
@ -499,15 +500,12 @@ dwapb_gpio_get_pdata_of(struct device *dev)
if (pp->idx == 0 && if (pp->idx == 0 &&
of_property_read_bool(port_np, "interrupt-controller")) { of_property_read_bool(port_np, "interrupt-controller")) {
pp->irq = irq_of_parse_and_map(port_np, 0); pp->irq = irq_of_parse_and_map(port_np, 0);
if (!pp->irq) { if (!pp->irq)
dev_warn(dev, "no irq for bank %s\n", dev_warn(dev, "no irq for port%d\n", pp->idx);
port_np->full_name);
}
} }
pp->irq_shared = false; pp->irq_shared = false;
pp->gpio_base = -1; pp->gpio_base = -1;
pp->name = port_np->full_name;
} }
return pdata; return pdata;

1
drivers/mfd/intel_quark_i2c_gpio.c
View File

@ -220,7 +220,6 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
/* Set the properties for portA */ /* Set the properties for portA */
pdata->properties->node = NULL; pdata->properties->node = NULL;
pdata->properties->name = "intel-quark-x1000-gpio-portA";
pdata->properties->idx = 0; pdata->properties->idx = 0;
pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO;
pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE; pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE;

1
include/linux/platform_data/gpio-dwapb.h
View File

@ -16,7 +16,6 @@
struct dwapb_port_property { struct dwapb_port_property {
struct device_node *node; struct device_node *node;
const char *name;
unsigned int idx; unsigned int idx;
unsigned int ngpio; unsigned int ngpio;
unsigned int gpio_base; unsigned int gpio_base;