Attachment #24694 for bug #39981

View | Details | Raw Unified | Return to bug 39981
Collapse All | Expand All

Lines 547-552 Link Here

(-)mod_marvel/i2c-algo-ks.c (+1 lines)
547	/* -----exported algorithm data: ------------------------------------- */	547	/* -----exported algorithm data: ------------------------------------- */
548		548
549	static struct i2c_algorithm i2c_ks_algo = {	549	static struct i2c_algorithm i2c_ks_algo = {
		550	THIS_MODULE,
550	"ks0127-bug algorithm",	551	"ks0127-bug algorithm",
551	I2C_ALGO_BIT,	552	I2C_ALGO_BIT,
552	bit_xfer,	553	bit_xfer,






static struct i2c_driver i2c_driver_ks0127 = {
	owner:		THIS_MODULE,
	name:		KS0127_DEVNAME,
	id:		I2C_DRIVERID_KS0127,
	flags:		I2C_DF_NOTIFY,
	attach_adapter:	ks0127_attach,
	detach_client:	ks0127_detach,
	command:	ks0127_command,
	inc_use:	NULL,
	dec_use:	NULL
};








static struct i2c_driver i2c_driver_maven = {
	owner:		THIS_MODULE,
	name:		MAVEN_DEVNAME,
	id:		I2C_DRIVERID_MGATVO,
	flags:		I2C_DF_NOTIFY,
	attach_adapter:	maven_attach,
	detach_client:	maven_detach,
	command:	maven_command,
	inc_use:	NULL, //inc use
	dec_use:	NULL  //dec use
};






#include "ks0127.h"
#include "maven.h"

#include <linux/i2c.h>
#include "i2c-algo-ks.h"



}


static void adap_inc_use(struct i2c_adapter *adap)
{
#ifdef MODULE
	MOD_INC_USE_COUNT;
#endif
}

static void adap_dec_use(struct i2c_adapter *adap)
{
#ifdef MODULE
	MOD_DEC_USE_COUNT;
#endif
}


static struct i2c_algo_ks_data mga_i2c_bit_ops_tmpl = {
	data:		NULL,
	setsda:		mga_setsda,



static struct i2c_adapter mga_i2c_adap_tmpl = {
	THIS_MODULE,
	"mgai2c",
	I2C_HW_B_BT848, /* needed for 2.4 tuner/msp3400*/	/* I2C_HW_B_G400 fixme */
	NULL,
	NULL,
	adap_inc_use,
	adap_dec_use,
	adap_reg_client,
	adap_unreg_client,
};

Return to bug 39981

Lines 1119-1132 Link Here

(-)mod_marvel/ks0127.c (-2 / +1 lines)
1119		1119
1120		1120
1121	static struct i2c_driver i2c_driver_ks0127 = {	1121	static struct i2c_driver i2c_driver_ks0127 = {
		1122	owner: THIS_MODULE,
1122	name: KS0127_DEVNAME,	1123	name: KS0127_DEVNAME,
1123	id: I2C_DRIVERID_KS0127,	1124	id: I2C_DRIVERID_KS0127,
1124	flags: I2C_DF_NOTIFY,	1125	flags: I2C_DF_NOTIFY,
1125	attach_adapter: ks0127_attach,	1126	attach_adapter: ks0127_attach,
1126	detach_client: ks0127_detach,	1127	detach_client: ks0127_detach,
1127	command: ks0127_command,	1128	command: ks0127_command,
1128	inc_use: NULL,
1129	dec_use: NULL
1130	};	1129	};
1131		1130
1132		1131

Lines 658-671 Link Here

(-)mod_marvel/maven.c (-2 / +1 lines)
658		658
659		659
660	static struct i2c_driver i2c_driver_maven = {	660	static struct i2c_driver i2c_driver_maven = {
		661	owner: THIS_MODULE,
661	name: MAVEN_DEVNAME,	662	name: MAVEN_DEVNAME,
662	id: I2C_DRIVERID_MGATVO,	663	id: I2C_DRIVERID_MGATVO,
663	flags: I2C_DF_NOTIFY,	664	flags: I2C_DF_NOTIFY,
664	attach_adapter: maven_attach,	665	attach_adapter: maven_attach,
665	detach_client: maven_detach,	666	detach_client: maven_detach,
666	command: maven_command,	667	command: maven_command,
667	inc_use: NULL, //inc use
668	dec_use: NULL //dec use
669	};	668	};
670		669
671		670

Lines 38-43 Link Here

(-)mod_marvel/mgai2c.c (-17 / +2 lines)
38	#include "ks0127.h"	38	#include "ks0127.h"
39	#include "maven.h"	39	#include "maven.h"
40		40
		41	#include <linux/i2c.h>
41	#include "i2c-algo-ks.h"	42	#include "i2c-algo-ks.h"
42		43
43		44
Lines 267-287 Link Here
267	}	268	}
268		269
269		270
270	static void adap_inc_use(struct i2c_adapter *adap)
271	{
272	#ifdef MODULE
273	MOD_INC_USE_COUNT;
274	#endif
275	}
276
277	static void adap_dec_use(struct i2c_adapter *adap)
278	{
279	#ifdef MODULE
280	MOD_DEC_USE_COUNT;
281	#endif
282	}
283
284
285	static struct i2c_algo_ks_data mga_i2c_bit_ops_tmpl = {	271	static struct i2c_algo_ks_data mga_i2c_bit_ops_tmpl = {
286	data: NULL,	272	data: NULL,
287	setsda: mga_setsda,	273	setsda: mga_setsda,
Lines 295-306 Link Here
295		281
296		282
297	static struct i2c_adapter mga_i2c_adap_tmpl = {	283	static struct i2c_adapter mga_i2c_adap_tmpl = {
		284	THIS_MODULE,
298	"mgai2c",	285	"mgai2c",
299	I2C_HW_B_BT848, /* needed for 2.4 tuner/msp3400/ / I2C_HW_B_G400 fixme */	286	I2C_HW_B_BT848, /* needed for 2.4 tuner/msp3400/ / I2C_HW_B_G400 fixme */
300	NULL,	287	NULL,
301	NULL,	288	NULL,
302	adap_inc_use,
303	adap_dec_use,
304	adap_reg_client,	289	adap_reg_client,
305	adap_unreg_client,	290	adap_unreg_client,
306	};	291	};