Commit 785e21cf authored by Hans de Goede's avatar Hans de Goede Committed by Wolfram Sang
Browse files

i2c: core: Do not print duplicate error when failing to register an i2c-client from ACPI 



i2c_new_client_device() already prints an error when it fails. Some
ACPI tables contain 2 ACPI devices describing the same i2c-client,
leading to errors like this:

[    1.620847] i2c i2c-4: Failed to register i2c client MAGN0001:00 at 0x1d (-16)
[    1.620870] i2c i2c-4: failed to add I2C device MAGN0001:00 from ACPI

There is nothing we can do about the first -EBUSY error being logged,
but the second error does not really add any new information, so lets
drop it.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent e71ba945

drivers/i2c/i2c-core-acpi.c

+1 −5
Original line number Diff line number Diff line
@@ -225,12 +225,8 @@ static void i2c_acpi_register_device(struct i2c_adapter *adapter, 
	adev->power.flags.ignore_parent = true;

	acpi_device_set_enumerated(adev);



	if (IS_ERR(i2c_new_client_device(adapter, info))) {

	if (IS_ERR(i2c_new_client_device(adapter, info)))

		adev->power.flags.ignore_parent = false;

		dev_err(&adapter->dev,

			"failed to add I2C device %s from ACPI\n",

			dev_name(&adev->dev));

	}

}



static acpi_status i2c_acpi_add_device(acpi_handle handle, u32 level,