[media] xc5000: remove static dependencies on xc5000 created by previous changesets
convert the firmware configuration attach-time parameter from
a pointer to an integer so as to remove the static dependency
created by the previous changesets.
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index 9103675..c003af5 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -27,23 +27,18 @@
struct dvb_frontend;
struct i2c_adapter;
-struct xc5000_fw_cfg {
- char *name;
- u16 size;
-};
+#define XC5000_FW_A_1_6_114 1
+#define XC5000_FW_C_41_024_5_31875 2
-extern struct xc5000_fw_cfg xc5000a_1_6_114;
-extern struct xc5000_fw_cfg xc5000c_41_024_5_31875;
-
-#define XC5000_DEFAULT_FIRMWARE &xc5000a_1_6_114
-#define XC5000C_DEFAULT_FIRMWARE &xc5000c_41_024_5_31875
+#define XC5000_DEFAULT_FIRMWARE XC5000_FW_A_1_6_114
+#define XC5000C_DEFAULT_FIRMWARE XC5000_FW_C_41_024_5_31875
struct xc5000_config {
u8 i2c_address;
u32 if_khz;
u8 radio_input;
- struct xc5000_fw_cfg *fw;
+ int fw;
};
/* xc5000 callback command */