Commit eac7b3b7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'drivers_soc_for_5.13' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 361aa4be 536e23c6

drivers/soc/ti/smartreflex.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/soc/ti/wkup_m3_ipc.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {