Skip to content

L
linux
Commit ae30a0db authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files
Options

media: ddbridge: remove ddb_info's from the global scope 

Since the DD hardware info and maps aren't needed anymore outside of
ddbridge-hw.c (they're returned via get_ddb_info() now), mark them
static and remove all refs from ddbridge-hw.h.
Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8e4eef22
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 55 deletions
drivers/media/pci/ddbridge/ddbridge-hw.c
View file @ ae30a0db
......@@ -87,13 +87,13 @@ static struct ddb_regmap octopus_map = {
/****************************************************************************/
const struct ddb_info ddb_none = {
static const struct ddb_info ddb_none = {
.type = DDB_NONE,
.name = "unknown Digital Devices PCIe card, install newer driver",
.regmap = &octopus_map,
};
const struct ddb_info ddb_octopus = {
static const struct ddb_info ddb_octopus = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Octopus DVB adapter",
.regmap = &octopus_map,
......@@ -101,7 +101,7 @@ const struct ddb_info ddb_octopus = {
.i2c_mask = 0x0f,
};
const struct ddb_info ddb_octopusv3 = {
static const struct ddb_info ddb_octopusv3 = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Octopus V3 DVB adapter",
.regmap = &octopus_map,
......@@ -109,7 +109,7 @@ const struct ddb_info ddb_octopusv3 = {
.i2c_mask = 0x0f,
};
const struct ddb_info ddb_octopus_le = {
static const struct ddb_info ddb_octopus_le = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Octopus LE DVB adapter",
.regmap = &octopus_map,
......@@ -117,7 +117,7 @@ const struct ddb_info ddb_octopus_le = {
.i2c_mask = 0x03,
};
const struct ddb_info ddb_octopus_oem = {
static const struct ddb_info ddb_octopus_oem = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Octopus OEM",
.regmap = &octopus_map,
......@@ -129,7 +129,7 @@ const struct ddb_info ddb_octopus_oem = {
.temp_bus = 0,
};
const struct ddb_info ddb_octopus_mini = {
static const struct ddb_info ddb_octopus_mini = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Octopus Mini",
.regmap = &octopus_map,
......@@ -137,7 +137,7 @@ const struct ddb_info ddb_octopus_mini = {
.i2c_mask = 0x0f,
};
const struct ddb_info ddb_v6 = {
static const struct ddb_info ddb_v6 = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Cine S2 V6 DVB adapter",
.regmap = &octopus_map,
......@@ -145,7 +145,7 @@ const struct ddb_info ddb_v6 = {
.i2c_mask = 0x07,
};
const struct ddb_info ddb_v6_5 = {
static const struct ddb_info ddb_v6_5 = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Cine S2 V6.5 DVB adapter",
.regmap = &octopus_map,
......@@ -153,7 +153,7 @@ const struct ddb_info ddb_v6_5 = {
.i2c_mask = 0x0f,
};
const struct ddb_info ddb_v7 = {
static const struct ddb_info ddb_v7 = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Cine S2 V7 DVB adapter",
.regmap = &octopus_map,
......@@ -164,7 +164,7 @@ const struct ddb_info ddb_v7 = {
.ts_quirks = TS_QUIRK_REVERSED,
};
const struct ddb_info ddb_v7a = {
static const struct ddb_info ddb_v7a = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Cine S2 V7 Advanced DVB adapter",
.regmap = &octopus_map,
......@@ -175,7 +175,7 @@ const struct ddb_info ddb_v7a = {
.ts_quirks = TS_QUIRK_REVERSED,
};
const struct ddb_info ddb_ctv7 = {
static const struct ddb_info ddb_ctv7 = {
.type = DDB_OCTOPUS,
.name = "Digital Devices Cine CT V7 DVB adapter",
.regmap = &octopus_map,
......@@ -185,7 +185,7 @@ const struct ddb_info ddb_ctv7 = {
.board_control_2 = 4,
};
const struct ddb_info ddb_satixS2v3 = {
static const struct ddb_info ddb_satixS2v3 = {
.type = DDB_OCTOPUS,
.name = "Mystique SaTiX-S2 V3 DVB adapter",
.regmap = &octopus_map,
......@@ -193,7 +193,7 @@ const struct ddb_info ddb_satixS2v3 = {
.i2c_mask = 0x07,
};
const struct ddb_info ddb_ci = {
static const struct ddb_info ddb_ci = {
.type = DDB_OCTOPUS_CI,
.name = "Digital Devices Octopus CI",
.regmap = &octopus_map,
......@@ -201,7 +201,7 @@ const struct ddb_info ddb_ci = {
.i2c_mask = 0x03,
};
const struct ddb_info ddb_cis = {
static const struct ddb_info ddb_cis = {
.type = DDB_OCTOPUS_CI,
.name = "Digital Devices Octopus CI single",
.regmap = &octopus_map,
......@@ -209,7 +209,7 @@ const struct ddb_info ddb_cis = {
.i2c_mask = 0x03,
};
const struct ddb_info ddb_ci_s2_pro = {
static const struct ddb_info ddb_ci_s2_pro = {
.type = DDB_OCTOPUS_CI,
.name = "Digital Devices Octopus CI S2 Pro",
.regmap = &octopus_map,
......@@ -219,7 +219,7 @@ const struct ddb_info ddb_ci_s2_pro = {
.board_control_2 = 4,
};
const struct ddb_info ddb_ci_s2_pro_a = {
static const struct ddb_info ddb_ci_s2_pro_a = {
.type = DDB_OCTOPUS_CI,
.name = "Digital Devices Octopus CI S2 Pro Advanced",
.regmap = &octopus_map,
......@@ -229,7 +229,7 @@ const struct ddb_info ddb_ci_s2_pro_a = {
.board_control_2 = 4,
};
const struct ddb_info ddb_dvbct = {
static const struct ddb_info ddb_dvbct = {
.type = DDB_OCTOPUS,
.name = "Digital Devices DVBCT V6.1 DVB adapter",
.regmap = &octopus_map,
......@@ -239,7 +239,7 @@ const struct ddb_info ddb_dvbct = {
/****************************************************************************/
const struct ddb_info ddb_ct2_8 = {
static const struct ddb_info ddb_ct2_8 = {
.type = DDB_OCTOPUS_MAX_CT,
.name = "Digital Devices MAX A8 CT2",
.regmap = &octopus_map,
......@@ -251,7 +251,7 @@ const struct ddb_info ddb_ct2_8 = {
.tempmon_irq = 24,
};
const struct ddb_info ddb_c2t2_8 = {
static const struct ddb_info ddb_c2t2_8 = {
.type = DDB_OCTOPUS_MAX_CT,
.name = "Digital Devices MAX A8 C2T2",
.regmap = &octopus_map,
......@@ -263,7 +263,7 @@ const struct ddb_info ddb_c2t2_8 = {
.tempmon_irq = 24,
};
const struct ddb_info ddb_isdbt_8 = {
static const struct ddb_info ddb_isdbt_8 = {
.type = DDB_OCTOPUS_MAX_CT,
.name = "Digital Devices MAX A8 ISDBT",
.regmap = &octopus_map,
......@@ -275,7 +275,7 @@ const struct ddb_info ddb_isdbt_8 = {
.tempmon_irq = 24,
};
const struct ddb_info ddb_c2t2i_v0_8 = {
static const struct ddb_info ddb_c2t2i_v0_8 = {
.type = DDB_OCTOPUS_MAX_CT,
.name = "Digital Devices MAX A8 C2T2I V0",
.regmap = &octopus_map,
......@@ -287,7 +287,7 @@ const struct ddb_info ddb_c2t2i_v0_8 = {
.tempmon_irq = 24,
};
const struct ddb_info ddb_c2t2i_8 = {
static const struct ddb_info ddb_c2t2i_8 = {
.type = DDB_OCTOPUS_MAX_CT,
.name = "Digital Devices MAX A8 C2T2I",
.regmap = &octopus_map,
......@@ -301,7 +301,7 @@ const struct ddb_info ddb_c2t2i_8 = {
/****************************************************************************/
const struct ddb_info ddb_s2_48 = {
static const struct ddb_info ddb_s2_48 = {
.type = DDB_OCTOPUS_MAX,
.name = "Digital Devices MAX S8 4/8",
.regmap = &octopus_map,
......
drivers/media/pci/ddbridge/ddbridge-hw.h
View file @ ae30a0db
......@@ -37,38 +37,6 @@ struct ddb_device_id {
/******************************************************************************/
extern const struct ddb_info ddb_none;
extern const struct ddb_info ddb_octopus;
extern const struct ddb_info ddb_octopusv3;
extern const struct ddb_info ddb_octopus_le;
extern const struct ddb_info ddb_octopus_oem;
extern const struct ddb_info ddb_octopus_mini;
extern const struct ddb_info ddb_v6;
extern const struct ddb_info ddb_v6_5;
extern const struct ddb_info ddb_v7;
extern const struct ddb_info ddb_v7a;
extern const struct ddb_info ddb_ctv7;
extern const struct ddb_info ddb_satixS2v3;
extern const struct ddb_info ddb_ci;
extern const struct ddb_info ddb_cis;
extern const struct ddb_info ddb_ci_s2_pro;
extern const struct ddb_info ddb_ci_s2_pro_a;
extern const struct ddb_info ddb_dvbct;
/****************************************************************************/
extern const struct ddb_info ddb_ct2_8;
extern const struct ddb_info ddb_c2t2_8;
extern const struct ddb_info ddb_isdbt_8;
extern const struct ddb_info ddb_c2t2i_v0_8;
extern const struct ddb_info ddb_c2t2i_8;
/****************************************************************************/
extern const struct ddb_info ddb_s2_48;
/****************************************************************************/
const struct ddb_info *get_ddb_info(u16 vendor, u16 device,
u16 subvendor, u16 subdevice);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7