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

gpio: pch: Use dev_err_probe()

Simplify the error path in ->probe() a bit by using dev_err_probe().

While at it, correct the messages since the called function were changed
in the past.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

+8 -16
+8 -16
drivers/gpio/gpio-pch.c
··· 357 357 358 358 chip->dev = dev; 359 359 ret = pcim_enable_device(pdev); 360 - if (ret) { 361 - dev_err(dev, "pci_enable_device FAILED"); 362 - return ret; 363 - } 360 + if (ret) 361 + return dev_err_probe(dev, ret, "Failed to enable PCI device\n"); 364 362 365 363 ret = pcim_iomap_regions(pdev, BIT(1), KBUILD_MODNAME); 366 - if (ret) { 367 - dev_err(dev, "pci_request_regions FAILED-%d", ret); 368 - return ret; 369 - } 364 + if (ret) 365 + return dev_err_probe(dev, ret, "Failed to request and map PCI regions\n"); 370 366 371 367 chip->base = pcim_iomap_table(pdev)[1]; 372 368 chip->ioh = id->driver_data; ··· 372 376 pch_gpio_setup(chip); 373 377 374 378 ret = devm_gpiochip_add_data(dev, &chip->gpio, chip); 375 - if (ret) { 376 - dev_err(dev, "PCH gpio: Failed to register GPIO\n"); 377 - return ret; 378 - } 379 + if (ret) 380 + return dev_err_probe(dev, ret, "Failed to register GPIO\n"); 379 381 380 382 irq_base = devm_irq_alloc_descs(dev, -1, 0, 381 383 gpio_pins[chip->ioh], NUMA_NO_NODE); ··· 390 396 391 397 ret = devm_request_irq(dev, pdev->irq, pch_gpio_handler, 392 398 IRQF_SHARED, KBUILD_MODNAME, chip); 393 - if (ret) { 394 - dev_err(dev, "request_irq failed\n"); 395 - return ret; 396 - } 399 + if (ret) 400 + return dev_err_probe(dev, ret, "Failed to request IRQ\n"); 397 401 398 402 return pch_gpio_alloc_generic_chip(chip, irq_base, gpio_pins[chip->ioh]); 399 403 }