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

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 <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 036f87643e139483d464c0c6778a3ce8dc282991..f366b86e4693d2b05ca4688d70f3dd1c571b03d1 100644 (file)
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -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
 
 /* defines below are from ivtv-driver.h */
 #define BLACKBIRD_FIRM_IMAGE_SIZE 256*1024
 
 /* defines below are from ivtv-driver.h */


@@ -575,13 +574,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
        if (retval < 0)
                dprintk(0, "Error with register_write\n");
 
        if (retval < 0)
                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);
 
 
        if (retval != 0) {
                dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
                                  &dev->pci->dev);
 
 
        if (retval != 0) {
                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 "
                        "not work without firmware loaded!\n");
                return -1;
                dprintk(0, "Please fix your hotplug setup, the board will "
                        "not work without firmware loaded!\n");
                return -1;