Commit e0099e9e authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (5734): Cx88: kill dev->fw_size

Now that cx88-blackbird is only accepting the official firmware image,
we no longer have any need to store the size of the firmware inside the
cx88 data structure.
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 25472237
...@@ -404,7 +404,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev) ...@@ -404,7 +404,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev)
u32 value; u32 value;
int i; int i;
for (i = 0; i < dev->fw_size; i++) { for (i = 0; i < BLACKBIRD_FIRM_IMAGE_SIZE; i++) {
memory_read(dev->core, i, &value); memory_read(dev->core, i, &value);
if (value == signature[signaturecnt]) if (value == signature[signaturecnt])
signaturecnt++; signaturecnt++;
...@@ -458,7 +458,6 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) ...@@ -458,7 +458,6 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
release_firmware(firmware); release_firmware(firmware);
return -1; return -1;
} }
dev->fw_size = firmware->size;
if (0 != memcmp(firmware->data, magic, 8)) { if (0 != memcmp(firmware->data, magic, 8)) {
dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n"); dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");
......
...@@ -462,7 +462,6 @@ struct cx8802_dev { ...@@ -462,7 +462,6 @@ struct cx8802_dev {
u32 mailbox; u32 mailbox;
int width; int width;
int height; int height;
int fw_size;
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
/* for dvb only */ /* for dvb only */
......
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