hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] xc5000: declare firmware configuration structures as static const 

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2012-02-08 15:03:07 -03:00 committed by Mauro Carvalho Chehab
parent 6fab81dfdc
commit a3db60bcf7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/common/tuners/xc5000.c
View File

@ -209,17 +209,17 @@ struct xc5000_fw_cfg {
u16 size; u16 size;
}; };
static struct xc5000_fw_cfg xc5000a_1_6_114 = { static const struct xc5000_fw_cfg xc5000a_1_6_114 = {
.name = "dvb-fe-xc5000-1.6.114.fw", .name = "dvb-fe-xc5000-1.6.114.fw",
.size = 12401, .size = 12401,
}; };
static struct xc5000_fw_cfg xc5000c_41_024_5_31875 = { static const struct xc5000_fw_cfg xc5000c_41_024_5_31875 = {
.name = "dvb-fe-xc5000c-41.024.5-31875.fw", .name = "dvb-fe-xc5000c-41.024.5-31875.fw",
.size = 16503, .size = 16503,
}; };
static inline struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id) static inline const struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id)
{ {
switch (chip_id) { switch (chip_id) {
default: default:
@ -578,7 +578,8 @@ static int xc5000_fwupload(struct dvb_frontend *fe)
struct xc5000_priv *priv = fe->tuner_priv; struct xc5000_priv *priv = fe->tuner_priv;
const struct firmware *fw; const struct firmware *fw;
int ret; int ret;
struct xc5000_fw_cfg *desired_fw = xc5000_assign_firmware(priv->chip_id); const struct xc5000_fw_cfg *desired_fw =
xc5000_assign_firmware(priv->chip_id);
/* request the firmware, this will block and timeout */ /* request the firmware, this will block and timeout */
printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n", printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n",