diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-05-30 12:29:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:23:52 -0400 |
commit | e0099e9edabd855bf83d3f57b1843f0b06bfb19d (patch) | |
tree | 4004b0c7ad9b75187b6cc5e5fd03321412f0bb02 | |
parent | 25472237320b4979d38eb15bc842f592c94d20f5 (diff) |
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: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 3 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index df700cff50e9..f2fcdb92ecce 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -404,7 +404,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev) | |||
404 | u32 value; | 404 | u32 value; |
405 | int i; | 405 | int i; |
406 | 406 | ||
407 | for (i = 0; i < dev->fw_size; i++) { | 407 | for (i = 0; i < BLACKBIRD_FIRM_IMAGE_SIZE; i++) { |
408 | memory_read(dev->core, i, &value); | 408 | memory_read(dev->core, i, &value); |
409 | if (value == signature[signaturecnt]) | 409 | if (value == signature[signaturecnt]) |
410 | signaturecnt++; | 410 | signaturecnt++; |
@@ -458,7 +458,6 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) | |||
458 | release_firmware(firmware); | 458 | release_firmware(firmware); |
459 | return -1; | 459 | return -1; |
460 | } | 460 | } |
461 | dev->fw_size = firmware->size; | ||
462 | 461 | ||
463 | if (0 != memcmp(firmware->data, magic, 8)) { | 462 | if (0 != memcmp(firmware->data, magic, 8)) { |
464 | dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n"); | 463 | dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n"); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index d773b6e2544d..e0290ba9f553 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -462,7 +462,6 @@ struct cx8802_dev { | |||
462 | u32 mailbox; | 462 | u32 mailbox; |
463 | int width; | 463 | int width; |
464 | int height; | 464 | int height; |
465 | int fw_size; | ||
466 | 465 | ||
467 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) | 466 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) |
468 | /* for dvb only */ | 467 | /* for dvb only */ |