Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiang Qiu and committed by
Linus Walleij
e8159181 a8fa91a7

+11 -15
+11 -13
drivers/gpio/gpio-dwapb.c
··· 409 409 err = bgpio_init(&port->gc, gpio->dev, 4, dat, set, NULL, dirout, 410 410 NULL, false); 411 411 if (err) { 412 - dev_err(gpio->dev, "failed to init gpio chip for %s\n", 413 - pp->name); 412 + dev_err(gpio->dev, "failed to init gpio chip for port%d\n", 413 + port->idx); 414 414 return err; 415 415 } 416 416 ··· 429 429 430 430 err = gpiochip_add_data(&port->gc, port); 431 431 if (err) 432 - dev_err(gpio->dev, "failed to register gpiochip for %s\n", 433 - pp->name); 432 + dev_err(gpio->dev, "failed to register gpiochip for port%d\n", 433 + port->idx); 434 434 else 435 435 port->is_registered = true; 436 436 ··· 480 480 481 481 if (of_property_read_u32(port_np, "reg", &pp->idx) || 482 482 pp->idx >= DWAPB_MAX_PORTS) { 483 - dev_err(dev, "missing/invalid port index for %s\n", 484 - port_np->full_name); 483 + dev_err(dev, 484 + "missing/invalid port index for port%d\n", i); 485 485 return ERR_PTR(-EINVAL); 486 486 } 487 487 488 488 if (of_property_read_u32(port_np, "snps,nr-gpios", 489 489 &pp->ngpio)) { 490 - dev_info(dev, "failed to get number of gpios for %s\n", 491 - port_np->full_name); 490 + dev_info(dev, 491 + "failed to get number of gpios for port%d\n", 492 + i); 492 493 pp->ngpio = 32; 493 494 } 494 495 ··· 500 499 if (pp->idx == 0 && 501 500 of_property_read_bool(port_np, "interrupt-controller")) { 502 501 pp->irq = irq_of_parse_and_map(port_np, 0); 503 - if (!pp->irq) { 504 - dev_warn(dev, "no irq for bank %s\n", 505 - port_np->full_name); 506 - } 502 + if (!pp->irq) 503 + dev_warn(dev, "no irq for port%d\n", pp->idx); 507 504 } 508 505 509 506 pp->irq_shared = false; 510 507 pp->gpio_base = -1; 511 - pp->name = port_np->full_name; 512 508 } 513 509 514 510 return pdata;
-1
drivers/mfd/intel_quark_i2c_gpio.c
··· 220 220 221 221 /* Set the properties for portA */ 222 222 pdata->properties->node = NULL; 223 - pdata->properties->name = "intel-quark-x1000-gpio-portA"; 224 223 pdata->properties->idx = 0; 225 224 pdata->properties->ngpio = INTEL_QUARK_MFD_NGPIO; 226 225 pdata->properties->gpio_base = INTEL_QUARK_MFD_GPIO_BASE;
-1
include/linux/platform_data/gpio-dwapb.h
··· 16 16 17 17 struct dwapb_port_property { 18 18 struct device_node *node; 19 - const char *name; 20 19 unsigned int idx; 21 20 unsigned int ngpio; 22 21 unsigned int gpio_base;