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

Commit d564baee authored by Laurent Riffard's avatar Laurent Riffard Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: drop empty i2c_driver.command implementations 



Given that implementing i2c_driver.command is optional, there is no
point in an empty implementation thereof.

Signed-off-by: default avatarLaurent Riffard <laurent.riffard@free.fr>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Michael Geng <linux@MichaelGeng.de>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 04b4b843

drivers/i2c/i2c-dev.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -464,12 +464,6 @@ static int i2cdev_detach_client(struct i2c_client *client) 
	return 0;

	return 0;

}

}





static int i2cdev_command(struct i2c_client *client, unsigned int cmd,

                           void *arg)

{

	return -1;

}



static struct i2c_driver i2cdev_driver = {

static struct i2c_driver i2cdev_driver = {

	.driver = {

	.driver = {

		.name	= "dev_driver",

		.name	= "dev_driver",
@@ -478,7 +472,6 @@ static struct i2c_driver i2cdev_driver = { 
	.attach_adapter	= i2cdev_attach_adapter,

	.attach_adapter	= i2cdev_attach_adapter,

	.detach_adapter	= i2cdev_detach_adapter,

	.detach_adapter	= i2cdev_detach_adapter,

	.detach_client	= i2cdev_detach_client,

	.detach_client	= i2cdev_detach_client,

	.command	= i2cdev_command,

};

};





static struct i2c_client i2cdev_client_template = {

static struct i2c_client i2cdev_client_template = {

drivers/media/video/saa5246a.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -151,12 +151,6 @@ static int saa5246a_detach(struct i2c_client *client) 
	return 0;

	return 0;

}

}





static int saa5246a_command(struct i2c_client *device, unsigned int cmd,

	void *arg)

{

	return -EINVAL;

}



/*

/*

 *	I2C interfaces

 *	I2C interfaces

 */

 */
@@ -169,7 +163,6 @@ static struct i2c_driver i2c_driver_videotext = 
	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */

	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */

	.attach_adapter = saa5246a_probe,

	.attach_adapter = saa5246a_probe,

	.detach_client  = saa5246a_detach,

	.detach_client  = saa5246a_detach,

	.command 	= saa5246a_command

};

};





static struct i2c_client client_template = {

static struct i2c_client client_template = {

drivers/media/video/saa5249.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -226,12 +226,6 @@ static int saa5249_detach(struct i2c_client *client) 
	return 0;

	return 0;

}

}





static int saa5249_command(struct i2c_client *device,

			     unsigned int cmd, void *arg)

{

	return -EINVAL;

}



/* new I2C driver support */

/* new I2C driver support */





static struct i2c_driver i2c_driver_videotext = 

static struct i2c_driver i2c_driver_videotext =
@@ -242,7 +236,6 @@ static struct i2c_driver i2c_driver_videotext = 
	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */

	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */

	.attach_adapter = saa5249_probe,

	.attach_adapter = saa5249_probe,

	.detach_client  = saa5249_detach,

	.detach_client  = saa5249_detach,

	.command 	= saa5249_command

};

};





static struct i2c_client client_template = {

static struct i2c_client client_template = {

drivers/video/matrox/matroxfb_maven.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -1288,10 +1288,6 @@ static int maven_detach_client(struct i2c_client* client) { 
	return 0;

	return 0;

}

}





static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg) {

	return -ENOIOCTLCMD;	/* or -EINVAL, depends on who will call this */

}



static struct i2c_driver maven_driver={

static struct i2c_driver maven_driver={

	.driver = {

	.driver = {

		.name	= "maven",

		.name	= "maven",
@@ -1299,7 +1295,6 @@ static struct i2c_driver maven_driver={ 
	.id		= I2C_DRIVERID_MGATVO,

	.id		= I2C_DRIVERID_MGATVO,

	.attach_adapter	= maven_attach_adapter,

	.attach_adapter	= maven_attach_adapter,

	.detach_client	= maven_detach_client,

	.detach_client	= maven_detach_client,

	.command	= maven_command,

};

};





/* ************************** */

/* ************************** */