tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
+10
-10
+3
-3
drivers/media/radio/si470x/radio-si470x-i2c.c
+3
-3
drivers/media/radio/si470x/radio-si470x-i2c.c
···
384
384
goto err_radio;
385
385
}
386
386
dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
387
-
radio->registers[DEVICEID], radio->registers[CHIPID]);
388
-
if ((radio->registers[CHIPID] & CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
387
+
radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
388
+
if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
389
389
dev_warn(&client->dev,
390
390
"This driver is known to work with "
391
391
"firmware version %hu,\n", RADIO_FW_VERSION);
392
392
dev_warn(&client->dev,
393
393
"but the device has firmware version %hu.\n",
394
-
radio->registers[CHIPID] & CHIPID_FIRMWARE);
394
+
radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
395
395
version_warning = 1;
396
396
}
397
397
+3
-3
drivers/media/radio/si470x/radio-si470x-usb.c
+3
-3
drivers/media/radio/si470x/radio-si470x-usb.c
···
686
686
goto err_ctrl;
687
687
}
688
688
dev_info(&intf->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
689
-
radio->registers[DEVICEID], radio->registers[CHIPID]);
690
-
if ((radio->registers[CHIPID] & CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
689
+
radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
690
+
if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
691
691
dev_warn(&intf->dev,
692
692
"This driver is known to work with "
693
693
"firmware version %hu,\n", RADIO_FW_VERSION);
694
694
dev_warn(&intf->dev,
695
695
"but the device has firmware version %hu.\n",
696
-
radio->registers[CHIPID] & CHIPID_FIRMWARE);
696
+
radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
697
697
version_warning = 1;
698
698
}
699
699
+4
-4
drivers/media/radio/si470x/radio-si470x.h
+4
-4
drivers/media/radio/si470x/radio-si470x.h
···
54
54
#define DEVICEID_PN 0xf000 /* bits 15..12: Part Number */
55
55
#define DEVICEID_MFGID 0x0fff /* bits 11..00: Manufacturer ID */
56
56
57
-
#define CHIPID 1 /* Chip ID */
58
-
#define CHIPID_REV 0xfc00 /* bits 15..10: Chip Version */
59
-
#define CHIPID_DEV 0x0200 /* bits 09..09: Device */
60
-
#define CHIPID_FIRMWARE 0x01ff /* bits 08..00: Firmware Version */
57
+
#define SI_CHIPID 1 /* Chip ID */
58
+
#define SI_CHIPID_REV 0xfc00 /* bits 15..10: Chip Version */
59
+
#define SI_CHIPID_DEV 0x0200 /* bits 09..09: Device */
60
+
#define SI_CHIPID_FIRMWARE 0x01ff /* bits 08..00: Firmware Version */
61
61
62
62
#define POWERCFG 2 /* Power Configuration */
63
63
#define POWERCFG_DSMUTE 0x8000 /* bits 15..15: Softmute Disable */