i3c: master: cdns: Use for_each_set_bit() (fd3f8f31) · Commits · 戴 / test

drivers/i3c/master/i3c-master-cdns.c

+10 −16

Original line number	Diff line number	Diff line
		@@ -903,7 +903,8 @@ static void cdns_i3c_master_upd_i3c_addr(struct i3c_dev_desc *dev)
		static int cdns_i3c_master_get_rr_slot(struct cdns_i3c_master *master,
		u8 dyn_addr)
		{
		u32 activedevs, rr;
		unsigned long activedevs;
		u32 rr;
		int i;

		if (!dyn_addr) {
		@@ -913,13 +914,10 @@ static int cdns_i3c_master_get_rr_slot(struct cdns_i3c_master *master,
		return ffs(master->free_rr_slots) - 1;
		}

		activedevs = readl(master->regs + DEVS_CTRL) &
		DEVS_CTRL_DEVS_ACTIVE_MASK;

		for (i = 1; i <= master->maxdevs; i++) {
		if (!(BIT(i) & activedevs))
		continue;
		activedevs = readl(master->regs + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
		activedevs &= ~BIT(0);

		for_each_set_bit(i, &activedevs, master->maxdevs + 1) {
		rr = readl(master->regs + DEV_ID_RR0(i));
		if (!(rr & DEV_ID_RR0_IS_I3C) \|\|
		DEV_ID_RR0_GET_DEV_ADDR(rr) != dyn_addr)
		@@ -1126,18 +1124,16 @@ static void cdns_i3c_master_upd_i3c_scl_lim(struct cdns_i3c_master *master)
		static int cdns_i3c_master_do_daa(struct i3c_master_controller *m)
		{
		struct cdns_i3c_master *master = to_cdns_i3c_master(m);
		u32 olddevs, newdevs;
		unsigned long olddevs, newdevs;
		int ret, slot;
		u8 addrs[MAX_DEVS] = { };
		u8 last_addr = 0;

		olddevs = readl(master->regs + DEVS_CTRL) & DEVS_CTRL_DEVS_ACTIVE_MASK;
		olddevs \|= BIT(0);

		/* Prepare RR slots before launching DAA. */
		for (slot = 1; slot <= master->maxdevs; slot++) {
		if (olddevs & BIT(slot))
		continue;

		for_each_clear_bit(slot, &olddevs, master->maxdevs + 1) {
		ret = i3c_master_get_free_addr(m, last_addr + 1);
		if (ret < 0)
		return -ENOSPC;
		@@ -1161,10 +1157,8 @@ static int cdns_i3c_master_do_daa(struct i3c_master_controller *m)
		* Clear all retaining registers filled during DAA. We already
		* have the addressed assigned to them in the addrs array.
		*/
		for (slot = 1; slot <= master->maxdevs; slot++) {
		if (newdevs & BIT(slot))
		for_each_set_bit(slot, &newdevs, master->maxdevs + 1)
		i3c_master_add_i3c_dev_locked(m, addrs[slot]);
		}

		/*
		* Clear slots that ended up not being used. Can be caused by I3C

Admin message