Commit e0099e9e authored May 30, 2007 by Michael Krufky Committed by Mauro Carvalho Chehab Jul 18, 2007

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>

parent 25472237

drivers/media/video/cx88/cx88-blackbird.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev)
		u32 value;
		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);
		if (value == signature[signaturecnt])
		signaturecnt++;
		@@ -458,7 +458,6 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
		release_firmware(firmware);
		return -1;
		}
		dev->fw_size = firmware->size;

		if (0 != memcmp(firmware->data, magic, 8)) {
		dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");

drivers/media/video/cx88/cx88.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,6 @@ struct cx8802_dev {
		u32 mailbox;
		int width;
		int height;
		int fw_size;

		#if defined(CONFIG_VIDEO_BUF_DVB) \|\| defined(CONFIG_VIDEO_BUF_DVB_MODULE)
		/* for dvb only */