Skip to content

Commit

Permalink
[media] xc5000: declare firmware configuration structures as static c…
Browse files Browse the repository at this point in the history
…onst

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Feb 14, 2012
1 parent 6fab81d commit a3db60b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/media/common/tuners/xc5000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit a3db60b

Please sign in to comment.