Skip to content

Commit 90c1b7f

Browse files
andy-shevgregkh
authored andcommitted
pinctrl: cy8c95x0: remove duplicate error message
[ Upstream commit 970dacb ] 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: 5ad32c3 ("pinctrl: cy8c95x0: Avoid returning positive values to user space") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 59f0f6e commit 90c1b7f

1 file changed

Lines changed: 5 additions & 16 deletions

File tree

drivers/pinctrl/pinctrl-cy8c95x0.c

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,6 +1345,7 @@ static int cy8c95x0_irq_setup(struct cy8c95x0_pinctrl *chip, int irq)
13451345
{
13461346
struct gpio_irq_chip *girq = &chip->gpio_chip.irq;
13471347
DECLARE_BITMAP(pending_irqs, MAX_LINE);
1348+
struct device *dev = chip->dev;
13481349
int ret;
13491350

13501351
mutex_init(&chip->irq_lock);
@@ -1371,17 +1372,9 @@ static int cy8c95x0_irq_setup(struct cy8c95x0_pinctrl *chip, int irq)
13711372
girq->handler = handle_simple_irq;
13721373
girq->threaded = true;
13731374

1374-
ret = devm_request_threaded_irq(chip->dev, irq,
1375-
NULL, cy8c95x0_irq_handler,
1376-
IRQF_ONESHOT | IRQF_SHARED,
1377-
dev_name(chip->dev), chip);
1378-
if (ret) {
1379-
dev_err(chip->dev, "failed to request irq %d\n", irq);
1380-
return ret;
1381-
}
1382-
dev_info(chip->dev, "Registered threaded IRQ\n");
1383-
1384-
return 0;
1375+
return devm_request_threaded_irq(dev, irq, NULL, cy8c95x0_irq_handler,
1376+
IRQF_ONESHOT | IRQF_SHARED,
1377+
dev_name(chip->dev), chip);
13851378
}
13861379

13871380
static int cy8c95x0_setup_pinctrl(struct cy8c95x0_pinctrl *chip)
@@ -1397,11 +1390,7 @@ static int cy8c95x0_setup_pinctrl(struct cy8c95x0_pinctrl *chip)
13971390
pd->owner = THIS_MODULE;
13981391

13991392
chip->pctldev = devm_pinctrl_register(chip->dev, pd, chip);
1400-
if (IS_ERR(chip->pctldev))
1401-
return dev_err_probe(chip->dev, PTR_ERR(chip->pctldev),
1402-
"can't register controller\n");
1403-
1404-
return 0;
1393+
return PTR_ERR_OR_ZERO(chip->pctldev);
14051394
}
14061395

14071396
static int cy8c95x0_detect(struct i2c_client *client,

0 commit comments

Comments
 (0)