staging: brcm80211: move qmath sources to phy directory

The functions provided by qmath sources are only used by the
phy source code so qmath sources have been moved there.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 8dc234d0a23e6600af24902e3107660d83bd6b23..21797748100f944f6f49b3574afcc25286b6b333 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -47,13 +47,13 @@ BRCMSMAC_OFILES := \
        phy/wlc_phy_n.o \
        phy/wlc_phytbl_lcn.o \
        phy/wlc_phytbl_n.o \
+       phy/wlc_phy_qmath.o \
        ../util/bcmutils.o \
        ../util/bcmwifi.o \
        ../util/bcmotp.o \
        ../util/bcmsrom.o \
        ../util/hnddma.o \
        ../util/nicpci.o \
-       ../util/qmath.o \
        ../util/nvram/nvram_ro.o
 
 MODULEPFX := brcmsmac

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index 072209710e314d0be3195f1028f17e8a622e6535..8fc1bef5c0a2cedccd4910239387a4713b06fb40 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -19,7 +19,6 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <wlc_cfg.h>
-#include <qmath.h>
 #include <linux/pci.h>
 #include <aiutils.h>
 #include <wlc_pmu.h>
@@ -27,10 +26,11 @@
 #include <bcmdevs.h>
 #include <sbhnddma.h>
 
-#include <wlc_phy_radio.h>
-#include <wlc_phy_int.h>
-#include <wlc_phy_lcn.h>
-#include <wlc_phytbl_lcn.h>
+#include "wlc_phy_radio.h"
+#include "wlc_phy_int.h"
+#include "wlc_phy_qmath.h"
+#include "wlc_phy_lcn.h"
+#include "wlc_phytbl_lcn.h"
 
 #define PLL_2064_NDIV          90
 #define PLL_2064_LOW_END_VCO   3000

diff --git a/drivers/staging/brcm80211/util/qmath.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
similarity index 99%
rename from drivers/staging/brcm80211/util/qmath.c
rename to drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
index 8b4a5b18d296fa438f1be5e93ef9d578348deff1..06172921a79b950d2379dd766fc889b7e493f252 100644 (file)
--- a/drivers/staging/brcm80211/util/qmath.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
@@ -15,7 +15,8 @@
  */
 
 #include <linux/types.h>
-#include "qmath.h"
+
+#include "wlc_phy_qmath.h"
 
 /*
 Description: This function saturate input 32 bit number into a 16 bit number.

diff --git a/drivers/staging/brcm80211/include/qmath.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h
similarity index 100%
rename from drivers/staging/brcm80211/include/qmath.h
rename to drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h