diff options
author | Michael Krufky <mkrufky@kernellabs.com> | 2012-02-08 13:03:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-02-14 14:22:46 -0500 |
commit | a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e (patch) | |
tree | f578ab11ae858d4d8ff9506ec48b53ed67127d50 /drivers/media/common | |
parent | 6fab81dfdc7b48c2e30ab05e9b30afb0c418bbbe (diff) |
[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>
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index 07fd80f4508e..7f98984e4fad 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -209,17 +209,17 @@ struct xc5000_fw_cfg { | |||
209 | u16 size; | 209 | u16 size; |
210 | }; | 210 | }; |
211 | 211 | ||
212 | static struct xc5000_fw_cfg xc5000a_1_6_114 = { | 212 | static const struct xc5000_fw_cfg xc5000a_1_6_114 = { |
213 | .name = "dvb-fe-xc5000-1.6.114.fw", | 213 | .name = "dvb-fe-xc5000-1.6.114.fw", |
214 | .size = 12401, | 214 | .size = 12401, |
215 | }; | 215 | }; |
216 | 216 | ||
217 | static struct xc5000_fw_cfg xc5000c_41_024_5_31875 = { | 217 | static const struct xc5000_fw_cfg xc5000c_41_024_5_31875 = { |
218 | .name = "dvb-fe-xc5000c-41.024.5-31875.fw", | 218 | .name = "dvb-fe-xc5000c-41.024.5-31875.fw", |
219 | .size = 16503, | 219 | .size = 16503, |
220 | }; | 220 | }; |
221 | 221 | ||
222 | static inline struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id) | 222 | static inline const struct xc5000_fw_cfg *xc5000_assign_firmware(int chip_id) |
223 | { | 223 | { |
224 | switch (chip_id) { | 224 | switch (chip_id) { |
225 | default: | 225 | default: |
@@ -578,7 +578,8 @@ static int xc5000_fwupload(struct dvb_frontend *fe) | |||
578 | struct xc5000_priv *priv = fe->tuner_priv; | 578 | struct xc5000_priv *priv = fe->tuner_priv; |
579 | const struct firmware *fw; | 579 | const struct firmware *fw; |
580 | int ret; | 580 | int ret; |
581 | struct xc5000_fw_cfg *desired_fw = xc5000_assign_firmware(priv->chip_id); | 581 | const struct xc5000_fw_cfg *desired_fw = |
582 | xc5000_assign_firmware(priv->chip_id); | ||
582 | 583 | ||
583 | /* request the firmware, this will block and timeout */ | 584 | /* request the firmware, this will block and timeout */ |
584 | printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n", | 585 | printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n", |