Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2e90e9b authored by Jean Delvare's avatar Jean Delvare
Browse files

ics932s401: Clean up detect function 



As kind is now hard-coded to -1, there is room for code clean-ups.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatar"Darrick J. Wong" <djwong@us.ibm.com>
parent ccfbbd08

drivers/misc/ics932s401.c

+15 −22
Original line number Original line Diff line number Diff line
@@ -417,32 +417,25 @@ static int ics932s401_detect(struct i2c_client *client, int kind, 
			  struct i2c_board_info *info)

			  struct i2c_board_info *info)

{

{

	struct i2c_adapter *adapter = client->adapter;

	struct i2c_adapter *adapter = client->adapter;

	int vendor, device, revision;





	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return -ENODEV;

		return -ENODEV;





	if (kind <= 0) {

	vendor = i2c_smbus_read_word_data(client, ICS932S401_REG_VENDOR_REV);

		int vendor, device, revision;



		vendor = i2c_smbus_read_word_data(client,

						  ICS932S401_REG_VENDOR_REV);

	vendor >>= 8;

	vendor >>= 8;

	revision = vendor >> ICS932S401_REV_SHIFT;

	revision = vendor >> ICS932S401_REV_SHIFT;

	vendor &= ICS932S401_VENDOR_MASK;

	vendor &= ICS932S401_VENDOR_MASK;

	if (vendor != ICS932S401_VENDOR)

	if (vendor != ICS932S401_VENDOR)

		return -ENODEV;

		return -ENODEV;





		device = i2c_smbus_read_word_data(client,

	device = i2c_smbus_read_word_data(client, ICS932S401_REG_DEVICE);

						  ICS932S401_REG_DEVICE);

	device >>= 8;

	device >>= 8;

	if (device != ICS932S401_DEVICE)

	if (device != ICS932S401_DEVICE)

		return -ENODEV;

		return -ENODEV;





	if (revision != ICS932S401_REV)

	if (revision != ICS932S401_REV)

			dev_info(&adapter->dev, "Unknown revision %d\n",

		dev_info(&adapter->dev, "Unknown revision %d\n", revision);

				 revision);

	} else

		dev_dbg(&adapter->dev, "detection forced\n");





	strlcpy(info->type, "ics932s401", I2C_NAME_SIZE);

	strlcpy(info->type, "ics932s401", I2C_NAME_SIZE);