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

gpio: rcar: Add helper variable dev = &pdev->dev

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-gpio@vger.kernel.org
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Geert Uytterhoeven and committed by
Linus Walleij b22978fc 8650ea1e

+16 -16
+16 -16
drivers/gpio/gpio-rcar.c
··· 356 356 struct resource *io, *irq; 357 357 struct gpio_chip *gpio_chip; 358 358 struct irq_chip *irq_chip; 359 - const char *name = dev_name(&pdev->dev); 359 + struct device *dev = &pdev->dev; 360 + const char *name = dev_name(dev); 360 361 int ret; 361 362 362 - p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL); 363 + p = devm_kzalloc(dev, sizeof(*p), GFP_KERNEL); 363 364 if (!p) { 364 - dev_err(&pdev->dev, "failed to allocate driver data\n"); 365 + dev_err(dev, "failed to allocate driver data\n"); 365 366 ret = -ENOMEM; 366 367 goto err0; 367 368 } ··· 381 380 irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 382 381 383 382 if (!io || !irq) { 384 - dev_err(&pdev->dev, "missing IRQ or IOMEM\n"); 383 + dev_err(dev, "missing IRQ or IOMEM\n"); 385 384 ret = -EINVAL; 386 385 goto err0; 387 386 } 388 387 389 - p->base = devm_ioremap_nocache(&pdev->dev, io->start, 390 - resource_size(io)); 388 + p->base = devm_ioremap_nocache(dev, io->start, resource_size(io)); 391 389 if (!p->base) { 392 - dev_err(&pdev->dev, "failed to remap I/O memory\n"); 390 + dev_err(dev, "failed to remap I/O memory\n"); 393 391 ret = -ENXIO; 394 392 goto err0; 395 393 } ··· 402 402 gpio_chip->set = gpio_rcar_set; 403 403 gpio_chip->to_irq = gpio_rcar_to_irq; 404 404 gpio_chip->label = name; 405 - gpio_chip->dev = &pdev->dev; 405 + gpio_chip->dev = dev; 406 406 gpio_chip->owner = THIS_MODULE; 407 407 gpio_chip->base = p->config.gpio_base; 408 408 gpio_chip->ngpio = p->config.number_of_pins; ··· 421 421 &gpio_rcar_irq_domain_ops, p); 422 422 if (!p->irq_domain) { 423 423 ret = -ENXIO; 424 - dev_err(&pdev->dev, "cannot initialize irq domain\n"); 424 + dev_err(dev, "cannot initialize irq domain\n"); 425 425 goto err0; 426 426 } 427 427 428 - if (devm_request_irq(&pdev->dev, irq->start, 429 - gpio_rcar_irq_handler, IRQF_SHARED, name, p)) { 430 - dev_err(&pdev->dev, "failed to request IRQ\n"); 428 + if (devm_request_irq(dev, irq->start, gpio_rcar_irq_handler, 429 + IRQF_SHARED, name, p)) { 430 + dev_err(dev, "failed to request IRQ\n"); 431 431 ret = -ENOENT; 432 432 goto err1; 433 433 } 434 434 435 435 ret = gpiochip_add(gpio_chip); 436 436 if (ret) { 437 - dev_err(&pdev->dev, "failed to add GPIO controller\n"); 437 + dev_err(dev, "failed to add GPIO controller\n"); 438 438 goto err1; 439 439 } 440 440 441 - dev_info(&pdev->dev, "driving %d GPIOs\n", p->config.number_of_pins); 441 + dev_info(dev, "driving %d GPIOs\n", p->config.number_of_pins); 442 442 443 443 /* warn in case of mismatch if irq base is specified */ 444 444 if (p->config.irq_base) { 445 445 ret = irq_find_mapping(p->irq_domain, 0); 446 446 if (p->config.irq_base != ret) 447 - dev_warn(&pdev->dev, "irq base mismatch (%u/%u)\n", 447 + dev_warn(dev, "irq base mismatch (%u/%u)\n", 448 448 p->config.irq_base, ret); 449 449 } 450 450 ··· 452 452 ret = gpiochip_add_pin_range(gpio_chip, p->config.pctl_name, 0, 453 453 gpio_chip->base, gpio_chip->ngpio); 454 454 if (ret < 0) 455 - dev_warn(&pdev->dev, "failed to add pin range\n"); 455 + dev_warn(dev, "failed to add pin range\n"); 456 456 } 457 457 458 458 return 0;