[media] si470x: cleanup define namespace

Some architectures already use CHIPID defines:

	drivers/media/radio/si470x/radio-si470x.h:57:0: warning: "CHIPID" redefined [enabled by default]
	drivers/media/radio/si470x/radio-si470x.h:57:0: warning: "CHIPID" redefined [enabled by default]
	drivers/media/radio/si470x/radio-si470x.h:57:0: warning: "CHIPID" redefined [enabled by default]

So, use SI_foo namespace to avoid conflicts.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 49fe8453e218177bbc0adf4a1cd255a88f40747b..471d6a8ae8a44663dd24a32d4995f5fa85217939 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -384,14 +384,14 @@ static int si470x_i2c_probe(struct i2c_client *client,
                goto err_radio;
        }
        dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
-                       radio->registers[DEVICEID], radio->registers[CHIPID]);
-       if ((radio->registers[CHIPID] & CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
+                       radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
+       if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
                dev_warn(&client->dev,
                        "This driver is known to work with "
                        "firmware version %hu,\n", RADIO_FW_VERSION);
                dev_warn(&client->dev,
                        "but the device has firmware version %hu.\n",
-                       radio->registers[CHIPID] & CHIPID_FIRMWARE);
+                       radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
                version_warning = 1;
        }
 

diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 57f0bc3b60e7d3a54943ee685c17b295050f79e4..091d793f65836182decf2fe13c9d55b27da8bf7d 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -686,14 +686,14 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
                goto err_ctrl;
        }
        dev_info(&intf->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
-                       radio->registers[DEVICEID], radio->registers[CHIPID]);
-       if ((radio->registers[CHIPID] & CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
+                       radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
+       if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
                dev_warn(&intf->dev,
                        "This driver is known to work with "
                        "firmware version %hu,\n", RADIO_FW_VERSION);
                dev_warn(&intf->dev,
                        "but the device has firmware version %hu.\n",
-                       radio->registers[CHIPID] & CHIPID_FIRMWARE);
+                       radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
                version_warning = 1;
        }
 

diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 4b7660470e2f8a6cfbd7f868eaf1312029e08b4c..6c0ca900702e9762e8ed1ae1e7fc6c3bc8f718c3 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -54,10 +54,10 @@
 #define DEVICEID_PN            0xf000  /* bits 15..12: Part Number */
 #define DEVICEID_MFGID         0x0fff  /* bits 11..00: Manufacturer ID */
 
-#define CHIPID                 1       /* Chip ID */
-#define CHIPID_REV             0xfc00  /* bits 15..10: Chip Version */
-#define CHIPID_DEV             0x0200  /* bits 09..09: Device */
-#define CHIPID_FIRMWARE                0x01ff  /* bits 08..00: Firmware Version */
+#define SI_CHIPID              1       /* Chip ID */
+#define SI_CHIPID_REV          0xfc00  /* bits 15..10: Chip Version */
+#define SI_CHIPID_DEV          0x0200  /* bits 09..09: Device */
+#define SI_CHIPID_FIRMWARE     0x01ff  /* bits 08..00: Firmware Version */
 
 #define POWERCFG               2       /* Power Configuration */
 #define POWERCFG_DSMUTE                0x8000  /* bits 15..15: Softmute Disable */