Commit 5b9c4e6d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (5478): Use ARRAY_SIZE and a cleaner logic for initializing tuner 



ATI HDTV Wonder needs to initialize some registers before allowing the
tuner to start working.
The current logic have lots of magic. This patch makes the code cleaner,
using ARRAY_SIZE() for the initialization array and using a
bidimensional array, instead of doing some stuff like:
	&buffer[i+2]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c1d57038

drivers/media/video/cx88/cx88-cards.c

+14 −5
Original line number Diff line number Diff line
@@ -1790,7 +1790,7 @@ static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core) 
		{ 0x03, 0x0C },

	};



	for (i = 0; i < 13; i++) {

	for (i = 0; i < ARRAY_SIZE(init_bufs); i++) {

		msg.buf = init_bufs[i];

		msg.len = (i != 12 ? 5 : 2);

		err = i2c_transfer(&core->i2c_adap, &msg, 1);
@@ -1917,12 +1917,21 @@ void cx88_card_setup(struct cx88_core *core) 
		if (0 == core->i2c_rc) {

			/* enable tuner */

			int i;

			static const u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 };

			static const u8 buffer [][2] = {

				{0x10,0x12},

				{0x13,0x04},

				{0x16,0x00},

				{0x14,0x04},

				{0x17,0x00}

			};

			core->i2c_client.addr = 0x0a;



			for (i = 0; i < 5; i++)

				if (2 != i2c_master_send(&core->i2c_client,&buffer[i*2],2))

					printk(KERN_WARNING "%s: Unable to enable tuner(%i).\n",

			for (i = 0; i < ARRAY_SIZE(buffer); i++)

				if (2 != i2c_master_send(&core->i2c_client,

							buffer[i],2))

					printk(KERN_WARNING

						"%s: Unable to enable "

						"tuner(%i).\n",

						core->name, i);

		}

		break;