lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (3982): Cx88-blackbird: use encoder firmware filename defined in cx2341x.h

Browse Source 
Since the filename of the cx23416 encoder firmware image
is defined in cx2341x.h, we don't need to explicitly define
it in cx88-blackbird.c anymore.
This changeset removes BLACKBIRD_FIRM_ENC_FILENAME,
replacing all occurrances with CX2341X_FIRM_ENC_FILENAME.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky
2006-05-22 10:32:00 -03:00
committed by Mauro Carvalho Chehab
parent 2544bf2d61
commit 48c35756a7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/cx88/cx88-blackbird.c
View File

@@ -54,7 +54,6 @@ static LIST_HEAD(cx8802_devlist);
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
#define BLACKBIRD_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw"
#define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024 #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
/* defines below are from ivtv-driver.h */ /* defines below are from ivtv-driver.h */
@@ -575,13 +574,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
if (retval < 0) if (retval < 0)
dprintk(0, "Error with register_write\n"); dprintk(0, "Error with register_write\n");
retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME,
&dev->pci->dev); &dev->pci->dev);
if (retval != 0) { if (retval != 0) {
dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n", dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
BLACKBIRD_FIRM_ENC_FILENAME); CX2341X_FIRM_ENC_FILENAME);
dprintk(0, "Please fix your hotplug setup, the board will " dprintk(0, "Please fix your hotplug setup, the board will "
"not work without firmware loaded!\n"); "not work without firmware loaded!\n");
return -1; return -1;