Commit 2957e53e authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab

media: ddbridge: link structure access cosmetics in ddb_port_probe()

Throughout the function, dev->link[l] is used several times. Unclutter
this a bit by declaring a ddb_link var at the top of the function, assign
the address of dev->link[l] to it and use that var to access the link[]
struct member.

Picked up from the upstream dddvb GIT.
Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7b6b9b15
...@@ -1850,6 +1850,7 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1850,6 +1850,7 @@ static void ddb_port_probe(struct ddb_port *port)
{ {
struct ddb *dev = port->dev; struct ddb *dev = port->dev;
u32 l = port->lnr; u32 l = port->lnr;
struct ddb_link *link = &dev->link[l];
u8 id, type; u8 id, type;
port->name = "NO MODULE"; port->name = "NO MODULE";
...@@ -1859,7 +1860,7 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1859,7 +1860,7 @@ static void ddb_port_probe(struct ddb_port *port)
/* Handle missing ports and ports without I2C */ /* Handle missing ports and ports without I2C */
if (dummy_tuner && !port->nr && if (dummy_tuner && !port->nr &&
dev->link[l].ids.device == 0x0005) { link->ids.device == 0x0005) {
port->name = "DUMMY"; port->name = "DUMMY";
port->class = DDB_PORT_TUNER; port->class = DDB_PORT_TUNER;
port->type = DDB_TUNER_DUMMY; port->type = DDB_TUNER_DUMMY;
...@@ -1873,14 +1874,14 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1873,14 +1874,14 @@ static void ddb_port_probe(struct ddb_port *port)
return; return;
} }
if (port->nr == 1 && dev->link[l].info->type == DDB_OCTOPUS_CI && if (port->nr == 1 && link->info->type == DDB_OCTOPUS_CI &&
dev->link[l].info->i2c_mask == 1) { link->info->i2c_mask == 1) {
port->name = "NO TAB"; port->name = "NO TAB";
port->class = DDB_PORT_NONE; port->class = DDB_PORT_NONE;
return; return;
} }
if (dev->link[l].info->type == DDB_OCTOPUS_MAX) { if (link->info->type == DDB_OCTOPUS_MAX) {
port->name = "DUAL DVB-S2 MAX"; port->name = "DUAL DVB-S2 MAX";
port->type_name = "MXL5XX"; port->type_name = "MXL5XX";
port->class = DDB_PORT_TUNER; port->class = DDB_PORT_TUNER;
...@@ -1891,8 +1892,8 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1891,8 +1892,8 @@ static void ddb_port_probe(struct ddb_port *port)
return; return;
} }
if (dev->link[l].info->type == DDB_OCTOPUS_MCI) { if (link->info->type == DDB_OCTOPUS_MCI) {
if (port->nr >= dev->link[l].info->mci) if (port->nr >= link->info->mci)
return; return;
port->name = "DUAL MCI"; port->name = "DUAL MCI";
port->type_name = "MCI"; port->type_name = "MCI";
...@@ -1901,7 +1902,7 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1901,7 +1902,7 @@ static void ddb_port_probe(struct ddb_port *port)
return; return;
} }
if (port->nr > 1 && dev->link[l].info->type == DDB_OCTOPUS_CI) { if (port->nr > 1 && link->info->type == DDB_OCTOPUS_CI) {
port->name = "CI internal"; port->name = "CI internal";
port->type_name = "INTERNAL"; port->type_name = "INTERNAL";
port->class = DDB_PORT_CI; port->class = DDB_PORT_CI;
...@@ -1986,7 +1987,7 @@ static void ddb_port_probe(struct ddb_port *port) ...@@ -1986,7 +1987,7 @@ static void ddb_port_probe(struct ddb_port *port)
port->class = DDB_PORT_TUNER; port->class = DDB_PORT_TUNER;
if (id == 0x51) { if (id == 0x51) {
if (port->nr == 0 && if (port->nr == 0 &&
dev->link[l].info->ts_quirks & TS_QUIRK_REVERSED) link->info->ts_quirks & TS_QUIRK_REVERSED)
port->type = DDB_TUNER_DVBS_STV0910_PR; port->type = DDB_TUNER_DVBS_STV0910_PR;
else else
port->type = DDB_TUNER_DVBS_STV0910_P; port->type = DDB_TUNER_DVBS_STV0910_P;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment