Commit d08ed106 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wolfram Sang
Browse files

i2c: Drop explicit initialization of struct i2c_device_id::driver_data to 0 



These drivers don't use the driver_data member of struct i2c_device_id,
so don't explicitly initialize this member.

This prepares putting driver_data in an anonymous union which requires
either no initialization or named designators. But it's also a nice
cleanup on its own.

While add it, also remove a comma after the sentinel entry.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 256ed310

drivers/i2c/i2c-core-base.c

+2 −2
Original line number Diff line number Diff line
@@ -1066,8 +1066,8 @@ EXPORT_SYMBOL(i2c_find_device_by_fwnode); 




static const struct i2c_device_id dummy_id[] = {

	{ "dummy", 0 },

	{ },

	{ "dummy" },

	{ }

};



static int dummy_probe(struct i2c_client *client)

drivers/i2c/i2c-slave-testunit.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void i2c_slave_testunit_remove(struct i2c_client *client) 
}



static const struct i2c_device_id i2c_slave_testunit_id[] = {

	{ "slave-testunit", 0 },

	{ "slave-testunit" },

	{ }

};

MODULE_DEVICE_TABLE(i2c, i2c_slave_testunit_id);

drivers/i2c/i2c-smbus.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void smbalert_remove(struct i2c_client *ara) 
}



static const struct i2c_device_id smbalert_ids[] = {

	{ "smbus_alert", 0 },

	{ "smbus_alert" },

	{ /* LIST END */ }

};

MODULE_DEVICE_TABLE(i2c, smbalert_ids);

drivers/i2c/muxes/i2c-mux-pca9541.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct pca9541 { 
};



static const struct i2c_device_id pca9541_id[] = {

	{"pca9541", 0},

	{ "pca9541" },

	{}

};