Commit 1c7c5fca authored by Shyam Sundar S K's avatar Shyam Sundar S K Committed by Wolfram Sang
Browse files

i2c: designware: Change from u32 to unsigned int for regmap_read() calls 



regmap_read() API signature expects the caller to send "unsigned int"
type to return back the read value, but there are some occurrences of 'u32'
across i2c-designware-* files.

Change them to match the regmap_read() signature.

Signed-off-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 60a1f9f2

drivers/i2c/busses/i2c-designware-common.c

+6 −5
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset) 


int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)

{

	u32 reg;

	unsigned int reg;

	int ret;



	ret = i2c_dw_acquire_lock(dev);
@@ -439,7 +439,7 @@ int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev) 
void __i2c_dw_disable(struct dw_i2c_dev *dev)

{

	int timeout = 100;

	u32 status;

	unsigned int status;



	do {

		__i2c_dw_disable_nowait(dev);
@@ -524,7 +524,7 @@ void i2c_dw_release_lock(struct dw_i2c_dev *dev) 
 */

int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev)

{

	u32 status;

	unsigned int status;

	int ret;



	ret = regmap_read_poll_timeout(dev->map, DW_IC_STATUS, status,
@@ -568,7 +568,8 @@ int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev) 


int i2c_dw_set_fifo_size(struct dw_i2c_dev *dev)

{

	u32 param, tx_fifo_depth, rx_fifo_depth;

	u32 tx_fifo_depth, rx_fifo_depth;

	unsigned int param;

	int ret;



	/*
@@ -608,7 +609,7 @@ u32 i2c_dw_func(struct i2c_adapter *adap) 


void i2c_dw_disable(struct dw_i2c_dev *dev)

{

	u32 dummy;

	unsigned int dummy;

	int ret;



	ret = i2c_dw_acquire_lock(dev);

drivers/i2c/busses/i2c-designware-core.h

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ struct dw_i2c_dev { 
	u8			*rx_buf;

	int			msg_err;

	unsigned int		status;

	u32			abort_source;

	unsigned int		abort_source;

	int			irq;

	u32			flags;

	struct i2c_adapter	adapter;

drivers/i2c/busses/i2c-designware-master.c

+7 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev) 


static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)

{

	u32 comp_param1;

	unsigned int comp_param1;

	u32 sda_falling_time, scl_falling_time;

	struct i2c_timings *t = &dev->timings;

	const char *fp_str = "";
@@ -211,7 +211,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) 
{

	struct i2c_msg *msgs = dev->msgs;

	u32 ic_con = 0, ic_tar = 0;

	u32 dummy;

	unsigned int dummy;



	/* Disable the adapter */

	__i2c_dw_disable(dev);
@@ -287,7 +287,7 @@ static int amd_i2c_dw_xfer_quirk(struct i2c_adapter *adap, struct i2c_msg *msgs, 
	int msg_wrt_idx, msg_itr_lmt, buf_len, data_idx;

	int cmd = 0, status;

	u8 *tx_buf;

	u32 val;

	unsigned int val;



	/*

	 * In order to enable the interrupt for UCSI i.e. AMD NAVI GPU card,
@@ -505,7 +505,8 @@ i2c_dw_read(struct dw_i2c_dev *dev) 
	unsigned int rx_valid;



	for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) {

		u32 len, tmp;

		unsigned int tmp;

		u32 len;

		u8 *buf;



		if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD))
@@ -653,7 +654,7 @@ static const struct i2c_adapter_quirks i2c_dw_quirks = { 


static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev)

{

	u32 stat, dummy;

	unsigned int stat, dummy;



	/*

	 * The IC_INTR_STAT register just indicates "enabled" interrupts.
@@ -714,7 +715,7 @@ static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev) 
static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)

{

	struct dw_i2c_dev *dev = dev_id;

	u32 stat, enabled;

	unsigned int stat, enabled;



	regmap_read(dev->map, DW_IC_ENABLE, &enabled);

	regmap_read(dev->map, DW_IC_RAW_INTR_STAT, &stat);

drivers/i2c/busses/i2c-designware-slave.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave) 


static u32 i2c_dw_read_clear_intrbits_slave(struct dw_i2c_dev *dev)

{

	u32 stat, dummy;

	unsigned int stat, dummy;



	/*

	 * The IC_INTR_STAT register just indicates "enabled" interrupts.
@@ -150,7 +150,7 @@ static u32 i2c_dw_read_clear_intrbits_slave(struct dw_i2c_dev *dev) 
static irqreturn_t i2c_dw_isr_slave(int this_irq, void *dev_id)

{

	struct dw_i2c_dev *dev = dev_id;

	u32 raw_stat, stat, enabled, tmp;

	unsigned int raw_stat, stat, enabled, tmp;

	u8 val = 0, slave_activity;



	regmap_read(dev->map, DW_IC_ENABLE, &enabled);