Commit 16aed0a6 authored by Frank Li's avatar Frank Li Committed by Alexandre Belloni
Browse files

i3c: master: Replace hard code 2 with macro I3C_ADDR_SLOT_STATUS_BITS 



Replace the hardcoded value 2, which indicates 2 bits for I3C address
status, with the predefined macro I3C_ADDR_SLOT_STATUS_BITS.

Improve maintainability and extensibility of the code.

Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20241021-i3c_dts_assign-v8-1-4098b8bde01e@nxp.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 9852d85e

drivers/i3c/master.c

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static enum i3c_addr_slot_status 
i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)

{

	unsigned long status;

	int bitpos = addr * 2;

	int bitpos = addr * I3C_ADDR_SLOT_STATUS_BITS;



	if (addr > I2C_MAX_ADDR)

		return I3C_ADDR_SLOT_RSVD;
@@ -362,7 +362,7 @@ i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr) 
static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr,

					 enum i3c_addr_slot_status status)

{

	int bitpos = addr * 2;

	int bitpos = addr * I3C_ADDR_SLOT_STATUS_BITS;

	unsigned long *ptr;



	if (addr > I2C_MAX_ADDR)

include/linux/i3c/master.h

+3 −1
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ enum i3c_addr_slot_status { 
	I3C_ADDR_SLOT_STATUS_MASK = 3,

};



#define I3C_ADDR_SLOT_STATUS_BITS 2



/**

 * struct i3c_bus - I3C bus object

 * @cur_master: I3C master currently driving the bus. Since I3C is multi-master
@@ -354,7 +356,7 @@ enum i3c_addr_slot_status { 
struct i3c_bus {

	struct i3c_dev_desc *cur_master;

	int id;

	unsigned long addrslots[((I2C_MAX_ADDR + 1) * 2) / BITS_PER_LONG];

	unsigned long addrslots[((I2C_MAX_ADDR + 1) * I3C_ADDR_SLOT_STATUS_BITS) / BITS_PER_LONG];

	enum i3c_bus_mode mode;

	struct {

		unsigned long i3c;