Commit b539c44d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

net: wwan: iosm: Unify IO accessors used in the driver 



Currently we have readl()/writel()/ioread*()/iowrite*() APIs in use.
Let's unify to use only ioread*()/iowrite*() variants.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d99411f

drivers/net/wwan/iosm/iosm_ipc_mmio.c

+12 −10
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void ipc_mmio_update_cp_capability(struct iosm_mmio *ipc_mmio) 
	unsigned int ver;



	ver = ipc_mmio_get_cp_version(ipc_mmio);

	cp_cap = readl(ipc_mmio->base + ipc_mmio->offset.cp_capability);

	cp_cap = ioread32(ipc_mmio->base + ipc_mmio->offset.cp_capability);



	ipc_mmio->has_mux_lite = (ver >= IOSM_CP_VERSION) &&

				 !(cp_cap & DL_AGGR) && !(cp_cap & UL_AGGR);
@@ -150,7 +150,7 @@ enum ipc_mem_exec_stage ipc_mmio_get_exec_stage(struct iosm_mmio *ipc_mmio) 
	if (!ipc_mmio)

		return IPC_MEM_EXEC_STAGE_INVALID;



	return (enum ipc_mem_exec_stage)readl(ipc_mmio->base +

	return (enum ipc_mem_exec_stage)ioread32(ipc_mmio->base +

						 ipc_mmio->offset.exec_stage);

}
@@ -167,8 +167,8 @@ enum ipc_mem_device_ipc_state ipc_mmio_get_ipc_state(struct iosm_mmio *ipc_mmio) 
	if (!ipc_mmio)

		return IPC_MEM_DEVICE_IPC_INVALID;



	return (enum ipc_mem_device_ipc_state)

		readl(ipc_mmio->base + ipc_mmio->offset.ipc_status);

	return (enum ipc_mem_device_ipc_state)ioread32(ipc_mmio->base +

						       ipc_mmio->offset.ipc_status);

}



enum rom_exit_code ipc_mmio_get_rom_exit_code(struct iosm_mmio *ipc_mmio)
@@ -176,7 +176,7 @@ enum rom_exit_code ipc_mmio_get_rom_exit_code(struct iosm_mmio *ipc_mmio) 
	if (!ipc_mmio)

		return IMEM_ROM_EXIT_FAIL;



	return (enum rom_exit_code)readl(ipc_mmio->base +

	return (enum rom_exit_code)ioread32(ipc_mmio->base +

					    ipc_mmio->offset.rom_exit_code);

}
@@ -202,7 +202,7 @@ void ipc_mmio_set_psi_addr_and_size(struct iosm_mmio *ipc_mmio, dma_addr_t addr, 
		return;



	iowrite64(addr, ipc_mmio->base + ipc_mmio->offset.psi_address);

	writel(size, ipc_mmio->base + ipc_mmio->offset.psi_size);

	iowrite32(size, ipc_mmio->base + ipc_mmio->offset.psi_size);

}



void ipc_mmio_set_contex_info_addr(struct iosm_mmio *ipc_mmio, phys_addr_t addr)
@@ -218,6 +218,8 @@ void ipc_mmio_set_contex_info_addr(struct iosm_mmio *ipc_mmio, phys_addr_t addr) 


int ipc_mmio_get_cp_version(struct iosm_mmio *ipc_mmio)

{

	return ipc_mmio ? readl(ipc_mmio->base + ipc_mmio->offset.cp_version) :

			  -EFAULT;

	if (ipc_mmio)

		return ioread32(ipc_mmio->base + ipc_mmio->offset.cp_version);



	return -EFAULT;

}