platform/x86: intel_punit_ipc: use devm_platform_ioremap_resource() to simplify code (ba367730) · Commits · 戴 / test

drivers/platform/x86/intel_punit_ipc.c

+14 −29

Original line number	Diff line number	Diff line
		@@ -224,7 +224,6 @@ static irqreturn_t intel_punit_ioc(int irq, void *dev_id)

		static int intel_punit_get_bars(struct platform_device *pdev)
		{
		struct resource *res;
		void __iomem *addr;

		/*
		@@ -232,14 +231,12 @@ static int intel_punit_get_bars(struct platform_device *pdev)
		* - BIOS_IPC BASE_DATA
		* - BIOS_IPC BASE_IFACE
		*/
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(addr))
		return PTR_ERR(addr);
		punit_ipcdev->base[BIOS_IPC][BASE_DATA] = addr;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 1);
		if (IS_ERR(addr))
		return PTR_ERR(addr);
		punit_ipcdev->base[BIOS_IPC][BASE_IFACE] = addr;
		@@ -251,33 +248,21 @@ static int intel_punit_get_bars(struct platform_device *pdev)
		* - GTDRIVER_IPC BASE_DATA
		* - GTDRIVER_IPC BASE_IFACE
		*/
		res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
		if (res) {
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 2);
		if (!IS_ERR(addr))
		punit_ipcdev->base[ISPDRIVER_IPC][BASE_DATA] = addr;
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
		if (res) {
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 3);
		if (!IS_ERR(addr))
		punit_ipcdev->base[ISPDRIVER_IPC][BASE_IFACE] = addr;
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 4);
		if (res) {
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 4);
		if (!IS_ERR(addr))
		punit_ipcdev->base[GTDRIVER_IPC][BASE_DATA] = addr;
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 5);
		if (res) {
		addr = devm_ioremap_resource(&pdev->dev, res);
		addr = devm_platform_ioremap_resource(pdev, 5);
		if (!IS_ERR(addr))
		punit_ipcdev->base[GTDRIVER_IPC][BASE_IFACE] = addr;
		}

		return 0;
		}

Admin message