diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-07-24 17:59:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-07-24 18:00:10 +0200 |
| commit | 4d513573182a9e2424f43e07314600639ed4e7b4 (patch) | |
| tree | 1a0159dc412f8cb619cefc298a5c36d94ccb5895 /drivers/soc | |
| parent | a13c140cc289c0b7b3770bce5b3ad42ab35074aa (diff) | |
| parent | 48e54749c1b6446f53f7419c50ebe7c84f81cb0b (diff) | |
| download | linux-next-4d513573182a9e2424f43e07314600639ed4e7b4.tar.gz linux-next-4d513573182a9e2424f43e07314600639ed4e7b4.zip | |
Merge tag 'ixp4xx-soc-v7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into soc/drivers
IXP4xx SoC changes for v7.3:
- Add some MODULE_DEVICE_TABLE():s to the ixp4xx SoC drivers.
- Drop redundant dev_err() calls in the ixp4xx SoC drivers.
* tag 'ixp4xx-soc-v7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
soc: ixp4xx: Remove redundant dev_err()
soc: ixp4xx: npe: add missing MODULE_DEVICE_TABLE()
soc: ixp4xx: qmgr: add missing MODULE_DEVICE_TABLE()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ixp4xx/ixp4xx-npe.c | 1 | ||||
| -rw-r--r-- | drivers/soc/ixp4xx/ixp4xx-qmgr.c | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/soc/ixp4xx/ixp4xx-npe.c b/drivers/soc/ixp4xx/ixp4xx-npe.c index 33e2e0366f19..0b3cc471ed62 100644 --- a/drivers/soc/ixp4xx/ixp4xx-npe.c +++ b/drivers/soc/ixp4xx/ixp4xx-npe.c @@ -752,6 +752,7 @@ static const struct of_device_id ixp4xx_npe_of_match[] = { }, {}, }; +MODULE_DEVICE_TABLE(of, ixp4xx_npe_of_match); static struct platform_driver ixp4xx_npe_driver = { .driver = { diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c index 475e229039e3..492a31660535 100644 --- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c +++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c @@ -421,19 +421,13 @@ static int ixp4xx_qmgr_probe(struct platform_device *pdev) err = devm_request_irq(dev, irq1, handler1, 0, "IXP4xx Queue Manager", NULL); - if (err) { - dev_err(dev, "failed to request IRQ%i (%i)\n", - irq1, err); + if (err) return err; - } err = devm_request_irq(dev, irq2, handler2, 0, "IXP4xx Queue Manager", NULL); - if (err) { - dev_err(dev, "failed to request IRQ%i (%i)\n", - irq2, err); + if (err) return err; - } used_sram_bitmap[0] = 0xF; /* 4 first pages reserved for config */ spin_lock_init(&qmgr_lock); @@ -454,6 +448,7 @@ static const struct of_device_id ixp4xx_qmgr_of_match[] = { }, {}, }; +MODULE_DEVICE_TABLE(of, ixp4xx_qmgr_of_match); static struct platform_driver ixp4xx_qmgr_driver = { .driver = { |