Skip to content

Commit a137357

Browse files
committed
pinctrl: lynxpoint: Unify messages with help of dev_err_probe()
Unify error messages that might appear during probe phase by switching to use dev_err_probe(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent e2620a2 commit a137357

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

drivers/pinctrl/intel/pinctrl-lynxpoint.c

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -700,9 +700,9 @@ static int lp_gpio_add_pin_ranges(struct gpio_chip *chip)
700700

701701
ret = gpiochip_add_pin_range(chip, dev_name(dev), 0, 0, lg->soc->npins);
702702
if (ret)
703-
dev_err(dev, "failed to add GPIO pin range\n");
703+
return dev_err_probe(dev, ret, "failed to add GPIO pin range\n");
704704

705-
return ret;
705+
return 0;
706706
}
707707

708708
static int lp_gpio_probe(struct platform_device *pdev)
@@ -739,24 +739,18 @@ static int lp_gpio_probe(struct platform_device *pdev)
739739
lg->pctldesc.npins = lg->soc->npins;
740740

741741
lg->pctldev = devm_pinctrl_register(dev, &lg->pctldesc, lg);
742-
if (IS_ERR(lg->pctldev)) {
743-
dev_err(dev, "failed to register pinctrl driver\n");
744-
return PTR_ERR(lg->pctldev);
745-
}
742+
if (IS_ERR(lg->pctldev))
743+
return dev_err_probe(dev, PTR_ERR(lg->pctldev), "failed to register pinctrl\n");
746744

747745
platform_set_drvdata(pdev, lg);
748746

749747
io_rc = platform_get_resource(pdev, IORESOURCE_IO, 0);
750-
if (!io_rc) {
751-
dev_err(dev, "missing IO resources\n");
752-
return -EINVAL;
753-
}
748+
if (!io_rc)
749+
return dev_err_probe(dev, -EINVAL, "missing IO resources\n");
754750

755751
regs = devm_ioport_map(dev, io_rc->start, resource_size(io_rc));
756-
if (!regs) {
757-
dev_err(dev, "failed mapping IO region %pR\n", &io_rc);
758-
return -EBUSY;
759-
}
752+
if (!regs)
753+
return dev_err_probe(dev, -EBUSY, "failed mapping IO region %pR\n", &io_rc);
760754

761755
for (i = 0; i < lg->soc->ncommunities; i++) {
762756
struct intel_community *comm = &lg->communities[i];
@@ -807,10 +801,8 @@ static int lp_gpio_probe(struct platform_device *pdev)
807801
}
808802

809803
ret = devm_gpiochip_add_data(dev, gc, lg);
810-
if (ret) {
811-
dev_err(dev, "failed adding lp-gpio chip\n");
812-
return ret;
813-
}
804+
if (ret)
805+
return dev_err_probe(dev, ret, "failed to register gpiochip\n");
814806

815807
return 0;
816808
}

0 commit comments

Comments
 (0)