Commit 8f3075cc authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Andi Shyti
Browse files

i2c: smbus: remove i801 assumptions from SPD probing 



The check and warning are very specific to the SPD usage of the i801
driver. That was fine as long as i801 was the only caller of
i2c_register_spd(). Now that piix4 will be added as another user of that
function, the check and warning are not accurate anymore.
Instead of introducing a more complicated calling protocol only to print
a warning, drop the warning.
Even in cases where not all slots can be probed,
then at least probe the 8 slots that can be.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 45b8ee71

drivers/i2c/i2c-smbus.c

+4 −11
Original line number Diff line number Diff line
@@ -352,18 +352,11 @@ void i2c_register_spd(struct i2c_adapter *adap) 
		return;



	/*

	 * If we're a child adapter on a muxed segment, then limit slots to 8,

	 * as this is the max number of SPD EEPROMs that can be addressed per bus.

	 * The max number of SPD EEPROMs that can be addressed per bus is 8.

	 * If more slots are present either muxed or multiple busses are

	 * necessary or the additional slots are ignored.

	 */

	if (i2c_parent_is_i2c_adapter(adap)) {

		slot_count = 8;

	} else {

		if (slot_count > 8) {

			dev_warn(&adap->dev,

				 "More than 8 memory slots on a single bus, contact i801 maintainer to add missing mux config\n");

			return;

		}

	}

	slot_count = min(slot_count, 8);



	/*

	 * Memory types could be found at section 7.18.2 (Memory Device — Type), table 78