From: Michael Krufky Date: Wed, 8 Feb 2012 18:03:07 +0000 (-0300) Subject: [media] xc5000: declare firmware configuration structures as static const X-Git-Tag: firefly_0821_release~3680^2~275^2~2746 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a3db60bcf7671cc011ab4f848cbc40ff7ab52c1e;p=firefly-linux-kernel-4.4.55.git [media] xc5000: declare firmware configuration structures as static const Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- 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 { 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", .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", .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) { default: @@ -578,7 +578,8 @@ static int xc5000_fwupload(struct dvb_frontend *fe) struct xc5000_priv *priv = fe->tuner_priv; const struct firmware *fw; 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 */ printk(KERN_INFO "xc5000: waiting for firmware upload (%s)...\n",