iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: zoran: use upper case for card types

Browse Source 
Don't mix case there: let's just use uppercase, as this is
the common pattern for such define-like enums.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-10-01 11:00:29 +02:00
parent 05b837920f
commit 0568d6c20e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/media/zoran/zoran.h
View File

@ -75,11 +75,11 @@ enum card_type {
UNKNOWN = -1, UNKNOWN = -1,
/* Pinnacle/Miro */ /* Pinnacle/Miro */
DC10_old, /* DC30 like */ DC10_OLD, /* DC30 like */
DC10_new, /* DC10plus like */ DC10_NEW, /* DC10_PLUS like */
DC10plus, DC10_PLUS,
DC30, DC30,
DC30plus, DC30_PLUS,
/* Linux Media Labs */ /* Linux Media Labs */
LML33, LML33,

20
drivers/staging/media/zoran/zoran_card.c
View File

@ -104,8 +104,8 @@ MODULE_VERSION(ZORAN_VERSION);
.subvendor = (subven), .subdevice = (subdev), .driver_data = (data) } .subvendor = (subven), .subdevice = (subdev), .driver_data = (data) }
static const struct pci_device_id zr36067_pci_tbl[] = { static const struct pci_device_id zr36067_pci_tbl[] = {
ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10plus), ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10_PLUS),
ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC30PLUS, DC30plus), ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC30PLUS, DC30_PLUS),
ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10), ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10),
ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ), ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ),
ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS), ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS),
@ -311,7 +311,7 @@ static const unsigned short bt866_addrs[] = { 0x44, I2C_CLIENT_END };
static struct card_info zoran_cards[NUM_CARDS] = { static struct card_info zoran_cards[NUM_CARDS] = {
{ {
.type = DC10_old, .type = DC10_OLD,
.name = "DC10(old)", .name = "DC10(old)",
.i2c_decoder = "vpx3220a", .i2c_decoder = "vpx3220a",
.addrs_decoder = vpx3220_addrs, .addrs_decoder = vpx3220_addrs,
@ -340,7 +340,7 @@ static struct card_info zoran_cards[NUM_CARDS] = {
.input_mux = 0, .input_mux = 0,
.init = &dc10_init, .init = &dc10_init,
}, { }, {
.type = DC10_new, .type = DC10_NEW,
.name = "DC10(new)", .name = "DC10(new)",
.i2c_decoder = "saa7110", .i2c_decoder = "saa7110",
.addrs_decoder = saa7110_addrs, .addrs_decoder = saa7110_addrs,
@ -369,8 +369,8 @@ static struct card_info zoran_cards[NUM_CARDS] = {
.input_mux = 0, .input_mux = 0,
.init = &dc10plus_init, .init = &dc10plus_init,
}, { }, {
.type = DC10plus, .type = DC10_PLUS,
.name = "DC10plus", .name = "DC10_PLUS",
.i2c_decoder = "saa7110", .i2c_decoder = "saa7110",
.addrs_decoder = saa7110_addrs, .addrs_decoder = saa7110_addrs,
.i2c_encoder = "adv7175", .i2c_encoder = "adv7175",
@ -430,8 +430,8 @@ static struct card_info zoran_cards[NUM_CARDS] = {
.input_mux = 0, .input_mux = 0,
.init = &dc10_init, .init = &dc10_init,
}, { }, {
.type = DC30plus, .type = DC30_PLUS,
.name = "DC30plus", .name = "DC30_PLUS",
.i2c_decoder = "vpx3220a", .i2c_decoder = "vpx3220a",
.addrs_decoder = vpx3220_addrs, .addrs_decoder = vpx3220_addrs,
.i2c_encoder = "adv7175", .i2c_encoder = "adv7175",
@ -694,7 +694,7 @@ int zoran_check_jpg_settings(struct zoran *zr,
break; break;
case 4: case 4:
if (zr->card.type == DC10_new) { if (zr->card.type == DC10_NEW) {
pci_dbg(zr->pci_dev, "%s - HDec by 4 is not supported on the DC10\n", __func__); pci_dbg(zr->pci_dev, "%s - HDec by 4 is not supported on the DC10\n", __func__);
err0++; err0++;
break; break;
@ -715,7 +715,7 @@ int zoran_check_jpg_settings(struct zoran *zr,
/* We have to check the data the user has set */ /* We have to check the data the user has set */
if (settings->HorDcm != 1 && settings->HorDcm != 2 && if (settings->HorDcm != 1 && settings->HorDcm != 2 &&
(zr->card.type == DC10_new || settings->HorDcm != 4)) { (zr->card.type == DC10_NEW || settings->HorDcm != 4)) {
settings->HorDcm = clamp(settings->HorDcm, 1, 2); settings->HorDcm = clamp(settings->HorDcm, 1, 2);
err0++; err0++;
} }