V4L/DVB (5502): Sn9c102: more efficient register writing code

There were many places in the driver which had long sequences of constant
register initializations.  These were done with one function call per
register.  The register address and value were immediate values in the
function calls.
This is very inefficient, as each register and value take twice the space
when they are code, as each includes a push instruction to put it on
the stack.  There there is the overhead, both size and time, for a
function call for each register.  It's also quite a few lines of C code
to do this.
The patch creates a function that writes multiple registers from a list,
and a macro that makes it easy to construct a such a list as a const
static local to send to the function.
This gets rid of quite a bit of C code, and shrinks the driver by around
8k, while at the same time being more efficient.
Acked-by: Luca Risolia <luca.risolia@studio.unibo.it>

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 98 insertions, 190 deletions

diff --git a/drivers/media/video/sn9c102/sn9c102_hv7131r.c b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
index c4a3e3991e8..5a495baa5f9 100644
--- a/drivers/media/video/sn9c102/sn9c102_hv7131r.c
+++ b/drivers/media/video/sn9c102/sn9c102_hv7131r.c
@@ -28,192 +28,102 @@ static int hv7131r_init(struct sn9c102_device* cam)
 
 	switch (sn9c102_get_bridge(cam)) {
 	case BRIDGE_SN9C103:
-		err += sn9c102_write_reg(cam, 0x00, 0x03);
-		err += sn9c102_write_reg(cam, 0x1a, 0x04);
-		err += sn9c102_write_reg(cam, 0x20, 0x05);
-		err += sn9c102_write_reg(cam, 0x20, 0x06);
-		err += sn9c102_write_reg(cam, 0x03, 0x10);
-		err += sn9c102_write_reg(cam, 0x00, 0x14);
-		err += sn9c102_write_reg(cam, 0x60, 0x17);
-		err += sn9c102_write_reg(cam, 0x0a, 0x18);
-		err += sn9c102_write_reg(cam, 0xf0, 0x19);
-		err += sn9c102_write_reg(cam, 0x1d, 0x1a);
-		err += sn9c102_write_reg(cam, 0x10, 0x1b);
-		err += sn9c102_write_reg(cam, 0x02, 0x1c);
-		err += sn9c102_write_reg(cam, 0x03, 0x1d);
-		err += sn9c102_write_reg(cam, 0x0f, 0x1e);
-		err += sn9c102_write_reg(cam, 0x0c, 0x1f);
-		err += sn9c102_write_reg(cam, 0x00, 0x20);
-		err += sn9c102_write_reg(cam, 0x10, 0x21);
-		err += sn9c102_write_reg(cam, 0x20, 0x22);
-		err += sn9c102_write_reg(cam, 0x30, 0x23);
-		err += sn9c102_write_reg(cam, 0x40, 0x24);
-		err += sn9c102_write_reg(cam, 0x50, 0x25);
-		err += sn9c102_write_reg(cam, 0x60, 0x26);
-		err += sn9c102_write_reg(cam, 0x70, 0x27);
-		err += sn9c102_write_reg(cam, 0x80, 0x28);
-		err += sn9c102_write_reg(cam, 0x90, 0x29);
-		err += sn9c102_write_reg(cam, 0xa0, 0x2a);
-		err += sn9c102_write_reg(cam, 0xb0, 0x2b);
-		err += sn9c102_write_reg(cam, 0xc0, 0x2c);
-		err += sn9c102_write_reg(cam, 0xd0, 0x2d);
-		err += sn9c102_write_reg(cam, 0xe0, 0x2e);
-		err += sn9c102_write_reg(cam, 0xf0, 0x2f);
-		err += sn9c102_write_reg(cam, 0xff, 0x30);
+		err = sn9c102_write_const_regs(cam, {0x00, 0x03}, {0x1a, 0x04},
+					       {0x20, 0x05}, {0x20, 0x06},
+					       {0x03, 0x10}, {0x00, 0x14},
+					       {0x60, 0x17}, {0x0a, 0x18},
+					       {0xf0, 0x19}, {0x1d, 0x1a},
+					       {0x10, 0x1b}, {0x02, 0x1c},
+					       {0x03, 0x1d}, {0x0f, 0x1e},
+					       {0x0c, 0x1f}, {0x00, 0x20},
+					       {0x10, 0x21}, {0x20, 0x22},
+					       {0x30, 0x23}, {0x40, 0x24},
+					       {0x50, 0x25}, {0x60, 0x26},
+					       {0x70, 0x27}, {0x80, 0x28},
+					       {0x90, 0x29}, {0xa0, 0x2a},
+					       {0xb0, 0x2b}, {0xc0, 0x2c},
+					       {0xd0, 0x2d}, {0xe0, 0x2e},
+					       {0xf0, 0x2f}, {0xff, 0x30});
+
 		break;
 	case BRIDGE_SN9C105:
 	case BRIDGE_SN9C120:
-		err += sn9c102_write_reg(cam, 0x44, 0x01);
-		err += sn9c102_write_reg(cam, 0x40, 0x02);
-		err += sn9c102_write_reg(cam, 0x00, 0x03);
-		err += sn9c102_write_reg(cam, 0x1a, 0x04);
-		err += sn9c102_write_reg(cam, 0x44, 0x05);
-		err += sn9c102_write_reg(cam, 0x3e, 0x06);
-		err += sn9c102_write_reg(cam, 0x1a, 0x07);
-		err += sn9c102_write_reg(cam, 0x03, 0x10);
-		err += sn9c102_write_reg(cam, 0x08, 0x14);
-		err += sn9c102_write_reg(cam, 0xa3, 0x17);
-		err += sn9c102_write_reg(cam, 0x4b, 0x18);
-		err += sn9c102_write_reg(cam, 0x00, 0x19);
-		err += sn9c102_write_reg(cam, 0x1d, 0x1a);
-		err += sn9c102_write_reg(cam, 0x10, 0x1b);
-		err += sn9c102_write_reg(cam, 0x02, 0x1c);
-		err += sn9c102_write_reg(cam, 0x03, 0x1d);
-		err += sn9c102_write_reg(cam, 0x0f, 0x1e);
-		err += sn9c102_write_reg(cam, 0x0c, 0x1f);
-		err += sn9c102_write_reg(cam, 0x00, 0x20);
-		err += sn9c102_write_reg(cam, 0x29, 0x21);
-		err += sn9c102_write_reg(cam, 0x40, 0x22);
-		err += sn9c102_write_reg(cam, 0x54, 0x23);
-		err += sn9c102_write_reg(cam, 0x66, 0x24);
-		err += sn9c102_write_reg(cam, 0x76, 0x25);
-		err += sn9c102_write_reg(cam, 0x85, 0x26);
-		err += sn9c102_write_reg(cam, 0x94, 0x27);
-		err += sn9c102_write_reg(cam, 0xa1, 0x28);
-		err += sn9c102_write_reg(cam, 0xae, 0x29);
-		err += sn9c102_write_reg(cam, 0xbb, 0x2a);
-		err += sn9c102_write_reg(cam, 0xc7, 0x2b);
-		err += sn9c102_write_reg(cam, 0xd3, 0x2c);
-		err += sn9c102_write_reg(cam, 0xde, 0x2d);
-		err += sn9c102_write_reg(cam, 0xea, 0x2e);
-		err += sn9c102_write_reg(cam, 0xf4, 0x2f);
-		err += sn9c102_write_reg(cam, 0xff, 0x30);
-		err += sn9c102_write_reg(cam, 0x00, 0x3F);
-		err += sn9c102_write_reg(cam, 0xC7, 0x40);
-		err += sn9c102_write_reg(cam, 0x01, 0x41);
-		err += sn9c102_write_reg(cam, 0x44, 0x42);
-		err += sn9c102_write_reg(cam, 0x00, 0x43);
-		err += sn9c102_write_reg(cam, 0x44, 0x44);
-		err += sn9c102_write_reg(cam, 0x00, 0x45);
-		err += sn9c102_write_reg(cam, 0x44, 0x46);
-		err += sn9c102_write_reg(cam, 0x00, 0x47);
-		err += sn9c102_write_reg(cam, 0xC7, 0x48);
-		err += sn9c102_write_reg(cam, 0x01, 0x49);
-		err += sn9c102_write_reg(cam, 0xC7, 0x4A);
-		err += sn9c102_write_reg(cam, 0x01, 0x4B);
-		err += sn9c102_write_reg(cam, 0xC7, 0x4C);
-		err += sn9c102_write_reg(cam, 0x01, 0x4D);
-		err += sn9c102_write_reg(cam, 0x44, 0x4E);
-		err += sn9c102_write_reg(cam, 0x00, 0x4F);
-		err += sn9c102_write_reg(cam, 0x44, 0x50);
-		err += sn9c102_write_reg(cam, 0x00, 0x51);
-		err += sn9c102_write_reg(cam, 0x44, 0x52);
-		err += sn9c102_write_reg(cam, 0x00, 0x53);
-		err += sn9c102_write_reg(cam, 0xC7, 0x54);
-		err += sn9c102_write_reg(cam, 0x01, 0x55);
-		err += sn9c102_write_reg(cam, 0xC7, 0x56);
-		err += sn9c102_write_reg(cam, 0x01, 0x57);
-		err += sn9c102_write_reg(cam, 0xC7, 0x58);
-		err += sn9c102_write_reg(cam, 0x01, 0x59);
-		err += sn9c102_write_reg(cam, 0x44, 0x5A);
-		err += sn9c102_write_reg(cam, 0x00, 0x5B);
-		err += sn9c102_write_reg(cam, 0x44, 0x5C);
-		err += sn9c102_write_reg(cam, 0x00, 0x5D);
-		err += sn9c102_write_reg(cam, 0x44, 0x5E);
-		err += sn9c102_write_reg(cam, 0x00, 0x5F);
-		err += sn9c102_write_reg(cam, 0xC7, 0x60);
-		err += sn9c102_write_reg(cam, 0x01, 0x61);
-		err += sn9c102_write_reg(cam, 0xC7, 0x62);
-		err += sn9c102_write_reg(cam, 0x01, 0x63);
-		err += sn9c102_write_reg(cam, 0xC7, 0x64);
-		err += sn9c102_write_reg(cam, 0x01, 0x65);
-		err += sn9c102_write_reg(cam, 0x44, 0x66);
-		err += sn9c102_write_reg(cam, 0x00, 0x67);
-		err += sn9c102_write_reg(cam, 0x44, 0x68);
-		err += sn9c102_write_reg(cam, 0x00, 0x69);
-		err += sn9c102_write_reg(cam, 0x44, 0x6A);
-		err += sn9c102_write_reg(cam, 0x00, 0x6B);
-		err += sn9c102_write_reg(cam, 0xC7, 0x6C);
-		err += sn9c102_write_reg(cam, 0x01, 0x6D);
-		err += sn9c102_write_reg(cam, 0xC7, 0x6E);
-		err += sn9c102_write_reg(cam, 0x01, 0x6F);
-		err += sn9c102_write_reg(cam, 0xC7, 0x70);
-		err += sn9c102_write_reg(cam, 0x01, 0x71);
-		err += sn9c102_write_reg(cam, 0x44, 0x72);
-		err += sn9c102_write_reg(cam, 0x00, 0x73);
-		err += sn9c102_write_reg(cam, 0x44, 0x74);
-		err += sn9c102_write_reg(cam, 0x00, 0x75);
-		err += sn9c102_write_reg(cam, 0x44, 0x76);
-		err += sn9c102_write_reg(cam, 0x00, 0x77);
-		err += sn9c102_write_reg(cam, 0xC7, 0x78);
-		err += sn9c102_write_reg(cam, 0x01, 0x79);
-		err += sn9c102_write_reg(cam, 0xC7, 0x7A);
-		err += sn9c102_write_reg(cam, 0x01, 0x7B);
-		err += sn9c102_write_reg(cam, 0xC7, 0x7C);
-		err += sn9c102_write_reg(cam, 0x01, 0x7D);
-		err += sn9c102_write_reg(cam, 0x44, 0x7E);
-		err += sn9c102_write_reg(cam, 0x00, 0x7F);
-		err += sn9c102_write_reg(cam, 0x14, 0x84);
-		err += sn9c102_write_reg(cam, 0x00, 0x85);
-		err += sn9c102_write_reg(cam, 0x27, 0x86);
-		err += sn9c102_write_reg(cam, 0x00, 0x87);
-		err += sn9c102_write_reg(cam, 0x07, 0x88);
-		err += sn9c102_write_reg(cam, 0x00, 0x89);
-		err += sn9c102_write_reg(cam, 0xEC, 0x8A);
-		err += sn9c102_write_reg(cam, 0x0f, 0x8B);
-		err += sn9c102_write_reg(cam, 0xD8, 0x8C);
-		err += sn9c102_write_reg(cam, 0x0f, 0x8D);
-		err += sn9c102_write_reg(cam, 0x3D, 0x8E);
-		err += sn9c102_write_reg(cam, 0x00, 0x8F);
-		err += sn9c102_write_reg(cam, 0x3D, 0x90);
-		err += sn9c102_write_reg(cam, 0x00, 0x91);
-		err += sn9c102_write_reg(cam, 0xCD, 0x92);
-		err += sn9c102_write_reg(cam, 0x0f, 0x93);
-		err += sn9c102_write_reg(cam, 0xf7, 0x94);
-		err += sn9c102_write_reg(cam, 0x0f, 0x95);
-		err += sn9c102_write_reg(cam, 0x0C, 0x96);
-		err += sn9c102_write_reg(cam, 0x00, 0x97);
-		err += sn9c102_write_reg(cam, 0x00, 0x98);
-		err += sn9c102_write_reg(cam, 0x66, 0x99);
-		err += sn9c102_write_reg(cam, 0x05, 0x9A);
-		err += sn9c102_write_reg(cam, 0x00, 0x9B);
-		err += sn9c102_write_reg(cam, 0x04, 0x9C);
-		err += sn9c102_write_reg(cam, 0x00, 0x9D);
-		err += sn9c102_write_reg(cam, 0x08, 0x9E);
-		err += sn9c102_write_reg(cam, 0x00, 0x9F);
-		err += sn9c102_write_reg(cam, 0x2D, 0xC0);
-		err += sn9c102_write_reg(cam, 0x2D, 0xC1);
-		err += sn9c102_write_reg(cam, 0x3A, 0xC2);
-		err += sn9c102_write_reg(cam, 0x05, 0xC3);
-		err += sn9c102_write_reg(cam, 0x04, 0xC4);
-		err += sn9c102_write_reg(cam, 0x3F, 0xC5);
-		err += sn9c102_write_reg(cam, 0x00, 0xC6);
-		err += sn9c102_write_reg(cam, 0x00, 0xC7);
-		err += sn9c102_write_reg(cam, 0x50, 0xC8);
-		err += sn9c102_write_reg(cam, 0x3C, 0xC9);
-		err += sn9c102_write_reg(cam, 0x28, 0xCA);
-		err += sn9c102_write_reg(cam, 0xD8, 0xCB);
-		err += sn9c102_write_reg(cam, 0x14, 0xCC);
-		err += sn9c102_write_reg(cam, 0xEC, 0xCD);
-		err += sn9c102_write_reg(cam, 0x32, 0xCE);
-		err += sn9c102_write_reg(cam, 0xDD, 0xCF);
-		err += sn9c102_write_reg(cam, 0x32, 0xD0);
-		err += sn9c102_write_reg(cam, 0xDD, 0xD1);
-		err += sn9c102_write_reg(cam, 0x6A, 0xD2);
-		err += sn9c102_write_reg(cam, 0x50, 0xD3);
-		err += sn9c102_write_reg(cam, 0x00, 0xD4);
-		err += sn9c102_write_reg(cam, 0x00, 0xD5);
-		err += sn9c102_write_reg(cam, 0x00, 0xD6);
+		err = sn9c102_write_const_regs(cam, {0x44, 0x01}, {0x40, 0x02},
+					       {0x00, 0x03}, {0x1a, 0x04},
+					       {0x44, 0x05}, {0x3e, 0x06},
+					       {0x1a, 0x07}, {0x03, 0x10},
+					       {0x08, 0x14}, {0xa3, 0x17},
+					       {0x4b, 0x18}, {0x00, 0x19},
+					       {0x1d, 0x1a}, {0x10, 0x1b},
+					       {0x02, 0x1c}, {0x03, 0x1d},
+					       {0x0f, 0x1e}, {0x0c, 0x1f},
+					       {0x00, 0x20}, {0x29, 0x21},
+					       {0x40, 0x22}, {0x54, 0x23},
+					       {0x66, 0x24}, {0x76, 0x25},
+					       {0x85, 0x26}, {0x94, 0x27},
+					       {0xa1, 0x28}, {0xae, 0x29},
+					       {0xbb, 0x2a}, {0xc7, 0x2b},
+					       {0xd3, 0x2c}, {0xde, 0x2d},
+					       {0xea, 0x2e}, {0xf4, 0x2f},
+					       {0xff, 0x30}, {0x00, 0x3F},
+					       {0xC7, 0x40}, {0x01, 0x41},
+					       {0x44, 0x42}, {0x00, 0x43},
+					       {0x44, 0x44}, {0x00, 0x45},
+					       {0x44, 0x46}, {0x00, 0x47},
+					       {0xC7, 0x48}, {0x01, 0x49},
+					       {0xC7, 0x4A}, {0x01, 0x4B},
+					       {0xC7, 0x4C}, {0x01, 0x4D},
+					       {0x44, 0x4E}, {0x00, 0x4F},
+					       {0x44, 0x50}, {0x00, 0x51},
+					       {0x44, 0x52}, {0x00, 0x53},
+					       {0xC7, 0x54}, {0x01, 0x55},
+					       {0xC7, 0x56}, {0x01, 0x57},
+					       {0xC7, 0x58}, {0x01, 0x59},
+					       {0x44, 0x5A}, {0x00, 0x5B},
+					       {0x44, 0x5C}, {0x00, 0x5D},
+					       {0x44, 0x5E}, {0x00, 0x5F},
+					       {0xC7, 0x60}, {0x01, 0x61},
+					       {0xC7, 0x62}, {0x01, 0x63},
+					       {0xC7, 0x64}, {0x01, 0x65},
+					       {0x44, 0x66}, {0x00, 0x67},
+					       {0x44, 0x68}, {0x00, 0x69},
+					       {0x44, 0x6A}, {0x00, 0x6B},
+					       {0xC7, 0x6C}, {0x01, 0x6D},
+					       {0xC7, 0x6E}, {0x01, 0x6F},
+					       {0xC7, 0x70}, {0x01, 0x71},
+					       {0x44, 0x72}, {0x00, 0x73},
+					       {0x44, 0x74}, {0x00, 0x75},
+					       {0x44, 0x76}, {0x00, 0x77},
+					       {0xC7, 0x78}, {0x01, 0x79},
+					       {0xC7, 0x7A}, {0x01, 0x7B},
+					       {0xC7, 0x7C}, {0x01, 0x7D},
+					       {0x44, 0x7E}, {0x00, 0x7F},
+					       {0x14, 0x84}, {0x00, 0x85},
+					       {0x27, 0x86}, {0x00, 0x87},
+					       {0x07, 0x88}, {0x00, 0x89},
+					       {0xEC, 0x8A}, {0x0f, 0x8B},
+					       {0xD8, 0x8C}, {0x0f, 0x8D},
+					       {0x3D, 0x8E}, {0x00, 0x8F},
+					       {0x3D, 0x90}, {0x00, 0x91},
+					       {0xCD, 0x92}, {0x0f, 0x93},
+					       {0xf7, 0x94}, {0x0f, 0x95},
+					       {0x0C, 0x96}, {0x00, 0x97},
+					       {0x00, 0x98}, {0x66, 0x99},
+					       {0x05, 0x9A}, {0x00, 0x9B},
+					       {0x04, 0x9C}, {0x00, 0x9D},
+					       {0x08, 0x9E}, {0x00, 0x9F},
+					       {0x2D, 0xC0}, {0x2D, 0xC1},
+					       {0x3A, 0xC2}, {0x05, 0xC3},
+					       {0x04, 0xC4}, {0x3F, 0xC5},
+					       {0x00, 0xC6}, {0x00, 0xC7},
+					       {0x50, 0xC8}, {0x3C, 0xC9},
+					       {0x28, 0xCA}, {0xD8, 0xCB},
+					       {0x14, 0xCC}, {0xEC, 0xCD},
+					       {0x32, 0xCE}, {0xDD, 0xCF},
+					       {0x32, 0xD0}, {0xDD, 0xD1},
+					       {0x6A, 0xD2}, {0x50, 0xD3},
+					       {0x00, 0xD4}, {0x00, 0xD5},
+					       {0x00, 0xD6});
 		break;
 	default:
 		break;
@@ -434,14 +344,12 @@ static struct sn9c102_sensor hv7131r = {
 
 int sn9c102_probe_hv7131r(struct sn9c102_device* cam)
 {
-	int devid, err = 0;
+	int devid, err;
+
+	err = sn9c102_write_const_regs(cam, {0x09, 0x01}, {0x44, 0x02},
+				       {0x34, 0x01}, {0x20, 0x17},
+				       {0x34, 0x01}, {0x46, 0x01});
 
-	err += sn9c102_write_reg(cam, 0x09, 0x01);
-	err += sn9c102_write_reg(cam, 0x44, 0x02);
-	err += sn9c102_write_reg(cam, 0x34, 0x01);
-	err += sn9c102_write_reg(cam, 0x20, 0x17);
-	err += sn9c102_write_reg(cam, 0x34, 0x01);
-	err += sn9c102_write_reg(cam, 0x46, 0x01);
 	if (err)
 		return -EIO;