staging: nokia_h4p: move firmware macros to firmware part

As the TODO file suggests, move firmware file macros from the header
file to the file that deals with firmware. In the process also move
MODULE_FIRMWARE() instances to the same file. Remove the relevant item
from the TODO file.

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/nokia_h4p/TODO b/drivers/staging/nokia_h4p/TODO
index d997afe1417394393f004596c18699381b1fcd47..0ec5823e0ca89c6327afaaf1a07f84e009e037db 100644 (file)
--- a/drivers/staging/nokia_h4p/TODO
+++ b/drivers/staging/nokia_h4p/TODO
@@ -13,14 +13,6 @@ TODO:
 can we please get the naming straight. File names do not start with
 hci_ anymore. We moved away from it since that term is too generic.
 
-> +#define FW_NAME_TI1271_LE    "ti1273_le.bin"
-> +#define FW_NAME_TI1271               "ti1273.bin"
-> +#define FW_NAME_BCM2048              "bcmfw.bin"
-> +#define FW_NAME_CSR          "bc4fw.bin"
-
-We do these have to be global in a header file. This should be
-confined to the specific firmware part.
-
 > +struct hci_h4p_info {
 
 Can we please get rid of the hci_ prefix for everything. Copying from

diff --git a/drivers/staging/nokia_h4p/hci_h4p.h b/drivers/staging/nokia_h4p/hci_h4p.h
index 107e1dcfe5e8da92de5b29e7513429f0a7d5d1da..99c4da61a56c5295b1dc7e92e8adad1a18d0a0f2 100644 (file)
--- a/drivers/staging/nokia_h4p/hci_h4p.h
+++ b/drivers/staging/nokia_h4p/hci_h4p.h
@@ -26,12 +26,6 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci.h>
 
-#define FW_NAME_TI1271_PRELE   "ti1273_prele.bin"
-#define FW_NAME_TI1271_LE      "ti1273_le.bin"
-#define FW_NAME_TI1271         "ti1273.bin"
-#define FW_NAME_BCM2048                "bcmfw.bin"
-#define FW_NAME_CSR            "bc4fw.bin"
-
 #define UART_SYSC_OMAP_RESET   0x03
 #define UART_SYSS_RESETDONE    0x01
 #define UART_OMAP_SCR_EMPTY_THR        0x08

diff --git a/drivers/staging/nokia_h4p/nokia_core.c b/drivers/staging/nokia_h4p/nokia_core.c
index 8791c0bcb22a5cc1206b5d3fa5bd7449a5f4597f..5e19cd6ccda35eaf0f51df68991d69a09b18f9ca 100644 (file)
--- a/drivers/staging/nokia_h4p/nokia_core.c
+++ b/drivers/staging/nokia_h4p/nokia_core.c
@@ -1204,8 +1204,3 @@ MODULE_ALIAS("platform:hci_h4p");
 MODULE_DESCRIPTION("Bluetooth h4 driver with nokia extensions");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ville Tervo");
-MODULE_FIRMWARE(FW_NAME_TI1271_PRELE);
-MODULE_FIRMWARE(FW_NAME_TI1271_LE);
-MODULE_FIRMWARE(FW_NAME_TI1271);
-MODULE_FIRMWARE(FW_NAME_BCM2048);
-MODULE_FIRMWARE(FW_NAME_CSR);

diff --git a/drivers/staging/nokia_h4p/nokia_fw.c b/drivers/staging/nokia_h4p/nokia_fw.c
index cfea61cd59e9961e929a81421a395d99f9e2991f..14ba2193efb674c7db26faee2f4fbe9113f30c78 100644 (file)
--- a/drivers/staging/nokia_h4p/nokia_fw.c
+++ b/drivers/staging/nokia_h4p/nokia_fw.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/firmware.h>
 #include <linux/clk.h>
@@ -29,6 +30,12 @@
 
 #include "hci_h4p.h"
 
+#define FW_NAME_TI1271_PRELE   "ti1273_prele.bin"
+#define FW_NAME_TI1271_LE      "ti1273_le.bin"
+#define FW_NAME_TI1271         "ti1273.bin"
+#define FW_NAME_BCM2048                "bcmfw.bin"
+#define FW_NAME_CSR            "bc4fw.bin"
+
 static int fw_pos;
 
 /* Firmware handling */
@@ -193,3 +200,9 @@ void hci_h4p_parse_fw_event(struct hci_h4p_info *info, struct sk_buff *skb)
 
        return;
 }
+
+MODULE_FIRMWARE(FW_NAME_TI1271_PRELE);
+MODULE_FIRMWARE(FW_NAME_TI1271_LE);
+MODULE_FIRMWARE(FW_NAME_TI1271);
+MODULE_FIRMWARE(FW_NAME_BCM2048);
+MODULE_FIRMWARE(FW_NAME_CSR);