i3c: Simplify i3c_device_match_id()

{

	struct i3c_device_info devinfo;

	const struct i3c_device_id *id;

	u16 manuf, part, ext_info;

	bool rndpid;

	i3c_device_get_info(i3cdev, &devinfo);

	/*

	 * The lower 32bits of the provisional ID is just filled with a random

	 * value, try to match using DCR info.

	 */

	if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {

		u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);

		u16 part = I3C_PID_PART_ID(devinfo.pid);

		u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);

	manuf = I3C_PID_MANUF_ID(devinfo.pid);

	part = I3C_PID_PART_ID(devinfo.pid);

	ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);

	rndpid = I3C_PID_RND_LOWER_32BITS(devinfo.pid);

		/* First try to match by manufacturer/part ID. */

	for (id = id_table; id->match_flags != 0; id++) {

			if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=

			    I3C_MATCH_MANUF_AND_PART)

		if ((id->match_flags & I3C_MATCH_DCR) &&

		    id->dcr != devinfo.dcr)

			continue;

			if (manuf != id->manuf_id || part != id->part_id)

		if ((id->match_flags & I3C_MATCH_MANUF) &&

		    id->manuf_id != manuf)

			continue;

			if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&

			    ext_info != id->extra_info)

		if ((id->match_flags & I3C_MATCH_PART) &&

		    (rndpid || id->part_id != part))

			continue;

			return id;

		}

	}

		if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&

		    (rndpid || id->extra_info != ext_info))

			continue;

	/* Fallback to DCR match. */

	for (id = id_table; id->match_flags != 0; id++) {

		if ((id->match_flags & I3C_MATCH_DCR) &&

		    id->dcr == devinfo.dcr)

		return id;

	}