carl9170 firmware: checkpatch/style fixes

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt
index 00fbe8f4bd5754fc07fc65c874a8dadfa7ab9be8..1c9f0c8eb3595c2c6263be2edff948f51b3f68cd 100644 (file)
--- a/carlfw/CMakeLists.txt
+++ b/carlfw/CMakeLists.txt
@@ -54,7 +54,7 @@ add_custom_command(
        ARGS --strip-unneeded -O binary -j .fwdsc carl9170.elf carl9170.dsc
        TARGET firmware
        OUTPUTS carl9170.dsc)
-       
+
 add_custom_command(
        SOURCE firmware
        TARGET firmware

diff --git a/carlfw/include/config.h b/carlfw/include/config.h
index bebb26005e1c93872baf31e9780a733f6a841893..739c0dadd1da495ac37bb067b4ed89e30d8af6fe 100644 (file)
--- a/carlfw/include/config.h
+++ b/carlfw/include/config.h
@@ -31,9 +31,9 @@
 # error "See: http://gcc.gnu.org/gcc-4.4/changes.html / Caveats No. 4"
 #endif
 
-#if ((defined CONFIG_CARL9170FW_PRINTF) &&             \
-     (!defined CONFIG_CARL9170FW_DEBUG_USB) &&         \
-    (!defined CONFIG_CARL9170FW_DEBUG_UART))
+#if ((defined CONFIG_CARL9170FW_PRINTF) &&                     \
+       (!defined CONFIG_CARL9170FW_DEBUG_USB) &&               \
+       (!defined CONFIG_CARL9170FW_DEBUG_UART))
 # warning "You have disabled all debug message transports."
 # warning "However CONFIG_CARL9170FW_PRINTF is still set..."
 # warning "Which is a waste of firmware space, if you ask me."
@@ -55,7 +55,7 @@
 #define CONFIG_CARL9170FW_BACK_REQS_NUM        4
 
 #if ((defined CONFIG_CARL9170FW_DEBUG) ||      \
-     (defined CONFIG_CARL9170FW_LOOPBACK))
+       (defined CONFIG_CARL9170FW_LOOPBACK))
 #define CARL9170FW_UNUSABLE    y
 #endif
 

diff --git a/carlfw/include/dma.h b/carlfw/include/dma.h
index 51d0db4442aef7c3765a9083cc6f344dee345004..8f3a9df63e0dd65baac0496f72e3f8755a17b5ac 100644 (file)
--- a/carlfw/include/dma.h
+++ b/carlfw/include/dma.h
@@ -283,7 +283,7 @@ static inline __inline struct dma_desc *dma_dequeue_not_bits(struct dma_queue *q
             desc = (queue)->head)
 
 #define __for_each_desc_continue(desc, queue)                          \
-       for (;desc != (queue)->terminator;                              \
+       for (; desc != (queue)->terminator;                             \
             desc = (desc)->lastAddr->nextAddr)
 
 #define __for_each_desc(desc, queue)                                   \

diff --git a/carlfw/include/wl.h b/carlfw/include/wl.h
index 9064dcb2c6af35e28691f1f147e27a86be293aec..9af4fdb278c1c23efc5556917961e9e7ef9eaeac 100644 (file)
--- a/carlfw/include/wl.h
+++ b/carlfw/include/wl.h
@@ -263,9 +263,7 @@ void wlan_modify_beacon(const unsigned int vif,
                        const unsigned int bcn_addr,
                        const unsigned int bcn_len);
 
-void wlan_tx_complete(struct carl9170_tx_superframe *super,
-                      bool txs);
-
+void wlan_tx_complete(struct carl9170_tx_superframe *super, bool txs);
 void wlan_prepare_wol(void);
 
 static inline void __check_wlantx(void)

diff --git a/carlfw/src/hostif.c b/carlfw/src/hostif.c
index 0e7cbf2a23d572b614e095d6e65c5b2071c3b5a4..0708a725aeda21bf926698503466b7eba6ce39b4 100644 (file)
--- a/carlfw/src/hostif.c
+++ b/carlfw/src/hostif.c
@@ -134,9 +134,8 @@ static void handle_download_exception(void)
        }
 
        __for_each_desc_continue(desc, &fw.pta.down_queue) {
-               if ((desc->status & AR9170_OWN_BITS) == AR9170_OWN_BITS_SW) {
+               if ((desc->status & AR9170_OWN_BITS) == AR9170_OWN_BITS_SW)
                        dma_fix_downqueue(desc);
-               }
        }
 
 

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index a4d24b60b69bf56bb3851d17fd2a2414bcaef4d4..17cbaf922d06500a76234b4e78988edfc19cc76f 100644 (file)
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -54,10 +54,10 @@ void clock_set(enum cpu_clock_t clock_, bool on)
         * So watch out, if you need _stable_ timer interrupts.
         */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-        if (fw.phy.frequency < 3000000)
+       if (fw.phy.frequency < 3000000)
                set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
-        else
-                set(AR9170_PWR_REG_PLL_ADDAC, 0x5143);
+       else
+               set(AR9170_PWR_REG_PLL_ADDAC, 0x5143);
 #else
        set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 59e9141feeccdb9d107a8bde210cc1b968a87710..50b1f2bb8b77c773903ed871ede9337bd5e25d95 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -213,7 +213,7 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super)
 
 static inline u16 get_tid(struct ieee80211_hdr *hdr)
 {
-        return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
+       return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
 }
 
 /* This function will only work on uint32_t-aligned pointers! */
@@ -330,9 +330,8 @@ static void _wlan_tx(struct dma_desc *desc)
 {
        struct carl9170_tx_superframe *super = get_super(desc);
 
-       if (unlikely(super->s.assign_seq)) {
+       if (unlikely(super->s.assign_seq))
                wlan_assign_seq(&super->f.data.i3e, super->s.vif_id);
-       }
 
        if (unlikely(super->s.ampdu_commit_density)) {
                set(AR9170_MAC_REG_AMPDU_DENSITY,
@@ -730,9 +729,8 @@ static bool wlan_rx_wol_magic_packet(struct ieee80211_hdr *hdr, unsigned int len
                                found = 0;
                }
 
-               if (found == (6 + 16 * 6)) {
+               if (found == (6 + 16 * 6))
                        return true;
-               }
 
                data++;
        }
@@ -780,9 +778,9 @@ static void wlan_wol_connection_monitor(void)
        null->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
                IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS);
 
-        memcpy(null->addr1, fw.wlan.wol.cmd.bssid, 6);
-        memcpy(null->addr2, fw.wlan.wol.cmd.mac, 6);
-        memcpy(null->addr3, fw.wlan.wol.cmd.bssid, 6);
+       memcpy(null->addr1, fw.wlan.wol.cmd.bssid, 6);
+       memcpy(null->addr2, fw.wlan.wol.cmd.mac, 6);
+       memcpy(null->addr3, fw.wlan.wol.cmd.bssid, 6);
 
        wlan_tx_fw(&nullf->s, wlan_wol_connect_callback);
 }

diff --git a/carlfw/usb/usb.c b/carlfw/usb/usb.c
index 0d339801e4767572968bab4ee1586bbe2295165d..9ff31c4b9e2b895de1ca41d27701eabc0f66fafc 100644 (file)
--- a/carlfw/usb/usb.c
+++ b/carlfw/usb/usb.c
@@ -575,7 +575,7 @@ static int usb_get_interface(const struct usb_ctrlrequest *ctrl)
 static int usb_manipulate_feature(const struct usb_ctrlrequest *ctrl, bool __unused clear)
 {
        unsigned int feature;
-        if (USB_CHECK_REQTYPE(ctrl, USB_RECIP_DEVICE, USB_DIR_OUT))
+       if (USB_CHECK_REQTYPE(ctrl, USB_RECIP_DEVICE, USB_DIR_OUT))
                return -1;
 
        if (usb_configured() == false)

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index b230348c4d4d24817e6749c93d5e4ea96cb4f4e6..234f2a8a9efcf104d5f1bd6d42b4e894cd86317a 100644 (file)
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../include/generated")
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../extra")
-FIND_PACKAGE(GPERF REQUIRED) 
+FIND_PACKAGE(GPERF REQUIRED)
 
 BISON_TARGET(zconf zconf.y zconf.tab.c COMPILE_FLAGS "-l -b zconf -p zconf")
 FLEX_TARGET(zconfscan zconf.l lex.zconf.c COMPILE_FLAGS "-Pzconf -L")
@@ -22,6 +22,6 @@ SET(zconf_deps ${FLEX_zconfscan_OUTPUTS} ${GPERF_zconfhash_OUTPUTS})
 SET_SOURCE_FILES_PROPERTIES(${BISON_zconf_OUTPUTS}
       PROPERTIES OBJECT_DEPENDS "${zconf_deps}")
 
-set(conf_src conf.c ${BISON_zconf_OUTPUTS}) 
+set(conf_src conf.c ${BISON_zconf_OUTPUTS})
 
 add_executable(conf ${conf_src})

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index 2bf2d74e5c30e5128c05198b3bb05a35811c06c2..9443c802b25b8578f6afd2b2cb66243ab47f34f1 100644 (file)
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -187,7 +187,7 @@ struct carl9170_wol_cmd {
        u8              mac[6];
        u8              bssid[6];
        __le32          null_interval;
-       __le32          free_for_use2;
+       __le32          free_for_use2;
        __le32          mask;
        u8              pattern[32];
 } __packed;

diff --git a/include/shared/version.h b/include/shared/version.h
index 64703778cfeaac239ac91fe80e0b22cb94f67dab..e651db856344d8a25c1203f0bfae070a15d0fd55 100644 (file)
--- a/include/shared/version.h
+++ b/include/shared/version.h
@@ -1,7 +1,7 @@
 #ifndef __CARL9170_SHARED_VERSION_H
 #define __CARL9170_SHARED_VERSION_H
 #define CARL9170FW_VERSION_YEAR 11
-#define CARL9170FW_VERSION_MONTH 6
-#define CARL9170FW_VERSION_DAY 30
+#define CARL9170FW_VERSION_MONTH 8
+#define CARL9170FW_VERSION_DAY 15
 #define CARL9170FW_VERSION_GIT "1.9.4"
 #endif /* __CARL9170_SHARED_VERSION_H */