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

Commit 54430407 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-core: i2c bus should support PM entries in struct dev_pm_ops
  i2c: Get rid of I2C_CLIENT_MODULE_PARM
  i2c: Drop I2C_CLIENT_INSMOD_2 to 8
  i2c: Drop I2C_CLIENT_INSMOD_1
  i2c: Get rid of struct i2c_client_address_data
  i2c: Drop the kind parameter from detect callbacks
parents 3ea6b3d0 54067ee2

Documentation/i2c/writing-clients

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static struct i2c_driver foo_driver = { 
	/* if device autodetection is needed: */

	.class		= I2C_CLASS_SOMETHING,

	.detect		= foo_detect,

	.address_data	= &addr_data,

	.address_list	= normal_i2c,



	.shutdown	= foo_shutdown,	/* optional */

	.suspend	= foo_suspend,	/* optional */

drivers/hwmon/adm1021.c

+5 −6
Original line number Diff line number Diff line
@@ -34,9 +34,8 @@ 
static const unsigned short normal_i2c[] = {

	0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };



/* Insmod parameters */

I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm,

			mc1066);

enum chips {

	adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066 };



/* adm1021 constants specified below */
@@ -97,7 +96,7 @@ struct adm1021_data { 


static int adm1021_probe(struct i2c_client *client,

			 const struct i2c_device_id *id);

static int adm1021_detect(struct i2c_client *client, int kind,

static int adm1021_detect(struct i2c_client *client,

			  struct i2c_board_info *info);

static void adm1021_init_client(struct i2c_client *client);

static int adm1021_remove(struct i2c_client *client);
@@ -130,7 +129,7 @@ static struct i2c_driver adm1021_driver = { 
	.remove		= adm1021_remove,

	.id_table	= adm1021_id,

	.detect		= adm1021_detect,

	.address_data	= &addr_data,

	.address_list	= normal_i2c,

};



static ssize_t show_temp(struct device *dev,
@@ -284,7 +283,7 @@ static const struct attribute_group adm1021_group = { 
};



/* Return 0 if detection is successful, -ENODEV otherwise */

static int adm1021_detect(struct i2c_client *client, int kind,

static int adm1021_detect(struct i2c_client *client,

			  struct i2c_board_info *info)

{

	struct i2c_adapter *adapter = client->adapter;

drivers/hwmon/adm1025.c

+4 −8
Original line number Diff line number Diff line
@@ -64,11 +64,7 @@ 


static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };



/*

 * Insmod parameters

 */



I2C_CLIENT_INSMOD_2(adm1025, ne1619);

enum chips { adm1025, ne1619 };



/*

 * The ADM1025 registers
@@ -111,7 +107,7 @@ static const int in_scale[6] = { 2500, 2250, 3300, 5000, 12000, 3300 }; 


static int adm1025_probe(struct i2c_client *client,

			 const struct i2c_device_id *id);

static int adm1025_detect(struct i2c_client *client, int kind,

static int adm1025_detect(struct i2c_client *client,

			  struct i2c_board_info *info);

static void adm1025_init_client(struct i2c_client *client);

static int adm1025_remove(struct i2c_client *client);
@@ -137,7 +133,7 @@ static struct i2c_driver adm1025_driver = { 
	.remove		= adm1025_remove,

	.id_table	= adm1025_id,

	.detect		= adm1025_detect,

	.address_data	= &addr_data,

	.address_list	= normal_i2c,

};



/*
@@ -409,7 +405,7 @@ static const struct attribute_group adm1025_group_in4 = { 
};



/* Return 0 if detection is successful, -ENODEV otherwise */

static int adm1025_detect(struct i2c_client *client, int kind,

static int adm1025_detect(struct i2c_client *client,

			  struct i2c_board_info *info)

{

	struct i2c_adapter *adapter = client->adapter;

drivers/hwmon/adm1026.c

+4 −7
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
/* Addresses to scan */

static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };



/* Insmod parameters */

I2C_CLIENT_INSMOD_1(adm1026);



static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,

				-1, -1, -1, -1, -1, -1, -1, -1 };

static int gpio_output[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -293,7 +290,7 @@ struct adm1026_data { 


static int adm1026_probe(struct i2c_client *client,

			 const struct i2c_device_id *id);

static int adm1026_detect(struct i2c_client *client, int kind,

static int adm1026_detect(struct i2c_client *client,

			  struct i2c_board_info *info);

static int adm1026_remove(struct i2c_client *client);

static int adm1026_read_value(struct i2c_client *client, u8 reg);
@@ -305,7 +302,7 @@ static void adm1026_init_client(struct i2c_client *client); 




static const struct i2c_device_id adm1026_id[] = {

	{ "adm1026", adm1026 },

	{ "adm1026", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, adm1026_id);
@@ -319,7 +316,7 @@ static struct i2c_driver adm1026_driver = { 
	.remove		= adm1026_remove,

	.id_table	= adm1026_id,

	.detect		= adm1026_detect,

	.address_data	= &addr_data,

	.address_list	= normal_i2c,

};



static int adm1026_read_value(struct i2c_client *client, u8 reg)
@@ -1650,7 +1647,7 @@ static const struct attribute_group adm1026_group_in8_9 = { 
};



/* Return 0 if detection is successful, -ENODEV otherwise */

static int adm1026_detect(struct i2c_client *client, int kind,

static int adm1026_detect(struct i2c_client *client,

			  struct i2c_board_info *info)

{

	struct i2c_adapter *adapter = client->adapter;

drivers/hwmon/adm1029.c

+4 −10
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 
						0x2e, 0x2f, I2C_CLIENT_END

};



/*

 * Insmod parameters

 */



I2C_CLIENT_INSMOD_1(adm1029);



/*

 * The ADM1029 registers

 * Manufacturer ID is 0x41 for Analog Devices
@@ -117,7 +111,7 @@ static const u8 ADM1029_REG_FAN_DIV[] = { 


static int adm1029_probe(struct i2c_client *client,

			 const struct i2c_device_id *id);

static int adm1029_detect(struct i2c_client *client, int kind,

static int adm1029_detect(struct i2c_client *client,

			  struct i2c_board_info *info);

static int adm1029_remove(struct i2c_client *client);

static struct adm1029_data *adm1029_update_device(struct device *dev);
@@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client); 
 */



static const struct i2c_device_id adm1029_id[] = {

	{ "adm1029", adm1029 },

	{ "adm1029", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, adm1029_id);
@@ -142,7 +136,7 @@ static struct i2c_driver adm1029_driver = { 
	.remove		= adm1029_remove,

	.id_table	= adm1029_id,

	.detect		= adm1029_detect,

	.address_data	= &addr_data,

	.address_list	= normal_i2c,

};



/*
@@ -297,7 +291,7 @@ static const struct attribute_group adm1029_group = { 
 */



/* Return 0 if detection is successful, -ENODEV otherwise */

static int adm1029_detect(struct i2c_client *client, int kind,

static int adm1029_detect(struct i2c_client *client,

			  struct i2c_board_info *info)

{

	struct i2c_adapter *adapter = client->adapter;