diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 08:08:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 08:08:48 -0700 |
| commit | eac7b3b75880a7f2e250d8abecf33d9d5764e772 (patch) | |
| tree | 782d1b103afeae755a9614f011e22636c002f214 /drivers/soc | |
| parent | 361aa4be7095437a8a7e7e77a008f805b1025d76 (diff) | |
| parent | 536e23c607edf0e13092887b92e0d5c7d29462b4 (diff) | |
| download | linux-eac7b3b75880a7f2e250d8abecf33d9d5764e772.tar.gz linux-eac7b3b75880a7f2e250d8abecf33d9d5764e772.tar.bz2 linux-eac7b3b75880a7f2e250d8abecf33d9d5764e772.zip | |
Merge tag 'drivers_soc_for_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/drivers
SOC: Keystone driver update for v5.13
Couple of cleanup fixes in PM AVS and WKUP M3 drivers
* tag 'drivers_soc_for_5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
soc: ti: wkup_m3_ipc: Remove redundant error printing in wkup_m3_ipc_probe()
PM: AVS: remove redundant dev_err call in omap_sr_probe()
Link: https://lore.kernel.org/r/1623564105-10273-1-git-send-email-santosh.shilimkar@oracle.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/ti/smartreflex.c | 4 | ||||
| -rw-r--r-- | drivers/soc/ti/wkup_m3_ipc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/soc/ti/smartreflex.c b/drivers/soc/ti/smartreflex.c index 5376f3d22f31..06cbee5fd254 100644 --- a/drivers/soc/ti/smartreflex.c +++ b/drivers/soc/ti/smartreflex.c @@ -846,10 +846,8 @@ static int omap_sr_probe(struct platform_device *pdev) mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); sr_info->base = devm_ioremap_resource(&pdev->dev, mem); - if (IS_ERR(sr_info->base)) { - dev_err(&pdev->dev, "%s: ioremap fail\n", __func__); + if (IS_ERR(sr_info->base)) return PTR_ERR(sr_info->base); - } irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c index c3e2161df732..09abd17065ba 100644 --- a/drivers/soc/ti/wkup_m3_ipc.c +++ b/drivers/soc/ti/wkup_m3_ipc.c @@ -445,10 +445,8 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); m3_ipc->ipc_mem_base = devm_ioremap_resource(dev, res); - if (IS_ERR(m3_ipc->ipc_mem_base)) { - dev_err(dev, "could not ioremap ipc_mem\n"); + if (IS_ERR(m3_ipc->ipc_mem_base)) return PTR_ERR(m3_ipc->ipc_mem_base); - } irq = platform_get_irq(pdev, 0); if (!irq) { |