mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
pinctrl: cy8c95x0: remove duplicate error message
[ Upstream commit970dacb3b9] The pin control core is covered to report any error via message. The devm_request_threaded_irq() already prints an error message. Remove the duplicates. While at it, drop the info message as the same information about an IRQ in use can be retrieved differently. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linusw@kernel.org> Stable-dep-of:5ad32c3607("pinctrl: cy8c95x0: Avoid returning positive values to user space") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
a79fdd593c
commit
091709439f
@@ -1253,6 +1253,7 @@ static int cy8c95x0_irq_setup(struct cy8c95x0_pinctrl *chip, int irq)
|
||||
{
|
||||
struct gpio_irq_chip *girq = &chip->gpio_chip.irq;
|
||||
DECLARE_BITMAP(pending_irqs, MAX_LINE);
|
||||
struct device *dev = chip->dev;
|
||||
int ret;
|
||||
|
||||
mutex_init(&chip->irq_lock);
|
||||
@@ -1279,17 +1280,9 @@ static int cy8c95x0_irq_setup(struct cy8c95x0_pinctrl *chip, int irq)
|
||||
girq->handler = handle_simple_irq;
|
||||
girq->threaded = true;
|
||||
|
||||
ret = devm_request_threaded_irq(chip->dev, irq,
|
||||
NULL, cy8c95x0_irq_handler,
|
||||
IRQF_ONESHOT | IRQF_SHARED,
|
||||
dev_name(chip->dev), chip);
|
||||
if (ret) {
|
||||
dev_err(chip->dev, "failed to request irq %d\n", irq);
|
||||
return ret;
|
||||
}
|
||||
dev_info(chip->dev, "Registered threaded IRQ\n");
|
||||
|
||||
return 0;
|
||||
return devm_request_threaded_irq(dev, irq, NULL, cy8c95x0_irq_handler,
|
||||
IRQF_ONESHOT | IRQF_SHARED,
|
||||
dev_name(chip->dev), chip);
|
||||
}
|
||||
|
||||
static int cy8c95x0_setup_pinctrl(struct cy8c95x0_pinctrl *chip)
|
||||
@@ -1305,11 +1298,7 @@ static int cy8c95x0_setup_pinctrl(struct cy8c95x0_pinctrl *chip)
|
||||
pd->owner = THIS_MODULE;
|
||||
|
||||
chip->pctldev = devm_pinctrl_register(chip->dev, pd, chip);
|
||||
if (IS_ERR(chip->pctldev))
|
||||
return dev_err_probe(chip->dev, PTR_ERR(chip->pctldev),
|
||||
"can't register controller\n");
|
||||
|
||||
return 0;
|
||||
return PTR_ERR_OR_ZERO(chip->pctldev);
|
||||
}
|
||||
|
||||
static int cy8c95x0_detect(struct i2c_client *client,
|
||||
|
||||
Reference in New Issue
Block a user