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

Commit ff179c8c authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: Drop i2c_driver.flags, 1 of 3 



The I2C_DF_DUMMY flag is gone since 2.5.70, it's about time to
drop all ifdef'd out references thereto.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1de9e371

drivers/media/video/tvmixer.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -232,12 +232,8 @@ static struct i2c_driver driver = { 
#endif

#endif

	.name            = "tv card mixer driver",

	.name            = "tv card mixer driver",

	.id              = I2C_DRIVERID_TVMIXER,

	.id              = I2C_DRIVERID_TVMIXER,

#ifdef I2C_DF_DUMMY

	.flags           = I2C_DF_DUMMY,

#else

	.flags           = I2C_DF_NOTIFY,

	.flags           = I2C_DF_NOTIFY,

	.detach_adapter  = tvmixer_adapters,

	.detach_adapter  = tvmixer_adapters,

#endif

	.attach_adapter  = tvmixer_adapters,

	.attach_adapter  = tvmixer_adapters,

	.detach_client   = tvmixer_clients,

	.detach_client   = tvmixer_clients,

};

};

include/linux/i2c.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -252,11 +252,6 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data) 




/*flags for the driver struct: */

/*flags for the driver struct: */

#define I2C_DF_NOTIFY	0x01		/* notify on bus (de/a)ttaches 	*/

#define I2C_DF_NOTIFY	0x01		/* notify on bus (de/a)ttaches 	*/

#if 0

/* this flag is gone -- there is a (optional) driver->detach_adapter

 * callback now which can be used instead */

# define I2C_DF_DUMMY	0x02

#endif





/*flags for the client struct: */

/*flags for the client struct: */

#define I2C_CLIENT_ALLOW_USE		0x01	/* Client allows access */

#define I2C_CLIENT_ALLOW_USE		0x01	/* Client allows access */