1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 65430ecc180c..c8d6e9a04723 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1421,36 +1421,36 @@ static int vidioc_g_register(struct file *file, void *priv,
                        reg->val = value[0] | value[1] << 8 |
                                   value[2] << 16 | value[3] << 24;
                        break;
-                case 1: /* Colibri - read byte */
+                case 1: /* AFE - read byte */
-                        ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,
+                        ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-                case 14:        /* Colibri - read dword */
+                case 14: /* AFE - read dword */
-                        ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,
+                        ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
-                case 2: /* Hammerhead - read byte */
+                case 2: /* Video Block - read byte */
-                        ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,
+                        ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-                case 24:        /* Hammerhead - read dword */
+                case 24: /* Video Block - read dword */
-                        ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,
+                        ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
                                                  (u16)reg->reg, 2, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
-                case 3: /* flatiron - read byte */
+                case 3: /* I2S block - read byte */
                        ret = cx231xx_read_i2c_data(dev,
-                                                    Flatrion_DEVICE_ADDRESS,
+                                                    I2S_BLK_DEVICE_ADDRESS,
                                                    (u16)reg->reg, 1,
                                                    &data, 1);
                        reg->val = le32_to_cpu(data & 0xff);
                        break;
-                case 34:        /* flatiron - read dword */
+                case 34: /* I2S Block - read dword */
                        ret =
-                            cx231xx_read_i2c_data(dev, Flatrion_DEVICE_ADDRESS,
+                            cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
                                                  (u16)reg->reg, 1, &data, 4);
                        reg->val = le32_to_cpu(data);
                        break;
@@ -1503,43 +1503,43 @@ static int vidioc_s_register(struct file *file, void *priv,
                                                           (u16)reg->reg, data,
                                                           4);
                                break;
-                        case 1: /* Colibri - read byte */
+                        case 1: /* AFE - read byte */
                                ret = cx231xx_write_i2c_data(dev,
-                                                        Colibri_DEVICE_ADDRESS,
+                                                        AFE_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 1);
                                break;
-                        case 14:        /* Colibri - read dword */
+                        case 14: /* AFE - read dword */
                                ret = cx231xx_write_i2c_data(dev,
-                                                        Colibri_DEVICE_ADDRESS,
+                                                        AFE_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 4);
                                break;
-                        case 2: /* Hammerhead - read byte */
+                        case 2: /* Video Block - read byte */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                        HAMMERHEAD_I2C_ADDRESS,
+                                                        VID_BLK_I2C_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 1);
                                break;
-                        case 24:        /* Hammerhead - read dword */
+                        case 24: /* Video Block - read dword */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                        HAMMERHEAD_I2C_ADDRESS,
+                                                        VID_BLK_I2C_ADDRESS,
                                                        (u16)reg->reg, 2,
                                                        value, 4);
                                break;
-                        case 3: /* flatiron - read byte */
+                        case 3: /* I2S block - read byte */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                        Flatrion_DEVICE_ADDRESS,
+                                                        I2S_BLK_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 1,
                                                        value, 1);
                                break;
-                        case 34:        /* flatiron - read dword */
+                        case 34: /* I2S block - read dword */
                                ret =
                                    cx231xx_write_i2c_data(dev,
-                                                        Flatrion_DEVICE_ADDRESS,
+                                                        I2S_BLK_DEVICE_ADDRESS,
                                                        (u16)reg->reg, 1,
                                                        value, 4);
                                break;

diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index 65430ecc180c..c8d6e9a04723 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -1421,36 +1421,36 @@ static int vidioc_g_register(struct file file, void priv,
1421	reg->val = value[0] \| value[1] << 8 \|	1421	reg->val = value[0] \| value[1] << 8 \|
1422	value[2] << 16 \| value[3] << 24;	1422	value[2] << 16 \| value[3] << 24;
1423	break;	1423	break;
1424	case 1: /* Colibri - read byte */	1424	case 1: /* AFE - read byte */
1425	ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,	1425	ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
1426	(u16)reg->reg, 2, &data, 1);	1426	(u16)reg->reg, 2, &data, 1);
1427	reg->val = le32_to_cpu(data & 0xff);	1427	reg->val = le32_to_cpu(data & 0xff);
1428	break;	1428	break;
1429	case 14: /* Colibri - read dword */	1429	case 14: /* AFE - read dword */
1430	ret = cx231xx_read_i2c_data(dev, Colibri_DEVICE_ADDRESS,	1430	ret = cx231xx_read_i2c_data(dev, AFE_DEVICE_ADDRESS,
1431	(u16)reg->reg, 2, &data, 4);	1431	(u16)reg->reg, 2, &data, 4);
1432	reg->val = le32_to_cpu(data);	1432	reg->val = le32_to_cpu(data);
1433	break;	1433	break;
1434	case 2: /* Hammerhead - read byte */	1434	case 2: /* Video Block - read byte */
1435	ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,	1435	ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
1436	(u16)reg->reg, 2, &data, 1);	1436	(u16)reg->reg, 2, &data, 1);
1437	reg->val = le32_to_cpu(data & 0xff);	1437	reg->val = le32_to_cpu(data & 0xff);
1438	break;	1438	break;
1439	case 24: /* Hammerhead - read dword */	1439	case 24: /* Video Block - read dword */
1440	ret = cx231xx_read_i2c_data(dev, HAMMERHEAD_I2C_ADDRESS,	1440	ret = cx231xx_read_i2c_data(dev, VID_BLK_I2C_ADDRESS,
1441	(u16)reg->reg, 2, &data, 4);	1441	(u16)reg->reg, 2, &data, 4);
1442	reg->val = le32_to_cpu(data);	1442	reg->val = le32_to_cpu(data);
1443	break;	1443	break;
1444	case 3: /* flatiron - read byte */	1444	case 3: /* I2S block - read byte */
1445	ret = cx231xx_read_i2c_data(dev,	1445	ret = cx231xx_read_i2c_data(dev,
1446	Flatrion_DEVICE_ADDRESS,	1446	I2S_BLK_DEVICE_ADDRESS,
1447	(u16)reg->reg, 1,	1447	(u16)reg->reg, 1,
1448	&data, 1);	1448	&data, 1);
1449	reg->val = le32_to_cpu(data & 0xff);	1449	reg->val = le32_to_cpu(data & 0xff);
1450	break;	1450	break;
1451	case 34: /* flatiron - read dword */	1451	case 34: /* I2S Block - read dword */
1452	ret =	1452	ret =
1453	cx231xx_read_i2c_data(dev, Flatrion_DEVICE_ADDRESS,	1453	cx231xx_read_i2c_data(dev, I2S_BLK_DEVICE_ADDRESS,
1454	(u16)reg->reg, 1, &data, 4);	1454	(u16)reg->reg, 1, &data, 4);
1455	reg->val = le32_to_cpu(data);	1455	reg->val = le32_to_cpu(data);
1456	break;	1456	break;
@@ -1503,43 +1503,43 @@ static int vidioc_s_register(struct file file, void priv,
1503	(u16)reg->reg, data,	1503	(u16)reg->reg, data,
1504	4);	1504	4);
1505	break;	1505	break;
1506	case 1: /* Colibri - read byte */	1506	case 1: /* AFE - read byte */
1507	ret = cx231xx_write_i2c_data(dev,	1507	ret = cx231xx_write_i2c_data(dev,
1508	Colibri_DEVICE_ADDRESS,	1508	AFE_DEVICE_ADDRESS,
1509	(u16)reg->reg, 2,	1509	(u16)reg->reg, 2,
1510	value, 1);	1510	value, 1);
1511	break;	1511	break;
1512	case 14: /* Colibri - read dword */	1512	case 14: /* AFE - read dword */
1513	ret = cx231xx_write_i2c_data(dev,	1513	ret = cx231xx_write_i2c_data(dev,
1514	Colibri_DEVICE_ADDRESS,	1514	AFE_DEVICE_ADDRESS,
1515	(u16)reg->reg, 2,	1515	(u16)reg->reg, 2,
1516	value, 4);	1516	value, 4);
1517	break;	1517	break;
1518	case 2: /* Hammerhead - read byte */	1518	case 2: /* Video Block - read byte */
1519	ret =	1519	ret =
1520	cx231xx_write_i2c_data(dev,	1520	cx231xx_write_i2c_data(dev,
1521	HAMMERHEAD_I2C_ADDRESS,	1521	VID_BLK_I2C_ADDRESS,
1522	(u16)reg->reg, 2,	1522	(u16)reg->reg, 2,
1523	value, 1);	1523	value, 1);
1524	break;	1524	break;
1525	case 24: /* Hammerhead - read dword */	1525	case 24: /* Video Block - read dword */
1526	ret =	1526	ret =
1527	cx231xx_write_i2c_data(dev,	1527	cx231xx_write_i2c_data(dev,
1528	HAMMERHEAD_I2C_ADDRESS,	1528	VID_BLK_I2C_ADDRESS,
1529	(u16)reg->reg, 2,	1529	(u16)reg->reg, 2,
1530	value, 4);	1530	value, 4);
1531	break;	1531	break;
1532	case 3: /* flatiron - read byte */	1532	case 3: /* I2S block - read byte */
1533	ret =	1533	ret =
1534	cx231xx_write_i2c_data(dev,	1534	cx231xx_write_i2c_data(dev,
1535	Flatrion_DEVICE_ADDRESS,	1535	I2S_BLK_DEVICE_ADDRESS,
1536	(u16)reg->reg, 1,	1536	(u16)reg->reg, 1,
1537	value, 1);	1537	value, 1);
1538	break;	1538	break;
1539	case 34: /* flatiron - read dword */	1539	case 34: /* I2S block - read dword */
1540	ret =	1540	ret =
1541	cx231xx_write_i2c_data(dev,	1541	cx231xx_write_i2c_data(dev,
1542	Flatrion_DEVICE_ADDRESS,	1542	I2S_BLK_DEVICE_ADDRESS,
1543	(u16)reg->reg, 1,	1543	(u16)reg->reg, 1,
1544	value, 4);	1544	value, 4);
1545	break;	1545	break;