V4L/DVB (11894): flexcop-pci: dmesg visible names broken

Changeset 1589a993f074124c3edfff03656e910bb472eeaa broke user visible
names of flexcop-pci devices, as it did reorder the enum of card types,
but did not adjust the array containing the card names.

Reorder the names, and uses [FC_AIR_DVBT] = "Air2PC/AirStar 2 DVB-T"
assignment style for more clarity.

It also adds the revision Number to the name for SkyStar rev. 2.3 and rev 2.6
as I think it is useful to see in log output.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/b2c2/flexcop-misc.c b/drivers/media/dvb/b2c2/flexcop-misc.c
index e56627d2f0f42ddeaafdd38a5730fce0b192e527..f06f3a9070f564ca13e7c6bd28254b7891d4f6bf 100644 (file)
--- a/drivers/media/dvb/b2c2/flexcop-misc.c
+++ b/drivers/media/dvb/b2c2/flexcop-misc.c
@@ -46,16 +46,16 @@ static const char *flexcop_revision_names[] = {
 };
 
 static const char *flexcop_device_names[] = {
-       "Unknown device",
-       "Air2PC/AirStar 2 DVB-T",
-       "Air2PC/AirStar 2 ATSC 1st generation",
-       "Air2PC/AirStar 2 ATSC 2nd generation",
-       "Sky2PC/SkyStar 2 DVB-S",
-       "Sky2PC/SkyStar 2 DVB-S (old version)",
-       "Cable2PC/CableStar 2 DVB-C",
-       "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",
-       "Sky2PC/SkyStar 2 DVB-S rev 2.7a/u",
-       "Sky2PC/SkyStar 2 DVB-S rev 2.8",
+       [FC_UNK]        = "Unknown device",
+       [FC_CABLE]      = "Cable2PC/CableStar 2 DVB-C",
+       [FC_AIR_DVBT]   = "Air2PC/AirStar 2 DVB-T",
+       [FC_AIR_ATSC1]  = "Air2PC/AirStar 2 ATSC 1st generation",
+       [FC_AIR_ATSC2]  = "Air2PC/AirStar 2 ATSC 2nd generation",
+       [FC_AIR_ATSC3]  = "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)",
+       [FC_SKY_REV23]  = "Sky2PC/SkyStar 2 DVB-S rev 2.3 (old version)",
+       [FC_SKY_REV26]  = "Sky2PC/SkyStar 2 DVB-S rev 2.6",
+       [FC_SKY_REV27]  = "Sky2PC/SkyStar 2 DVB-S rev 2.7a/u",
+       [FC_SKY_REV28]  = "Sky2PC/SkyStar 2 DVB-S rev 2.8",
 };
 
 static const char *flexcop_bus_names[] = {