Staging: w35und: move source files to one directory

As we're trying to get rid of the "compatability layer" in the driver, move
everything under one directory. Keeping some of the files under
drivers/staging/winbond/linux is a major pain in the ass whenever you're
cleaning up the driver.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index ed3180c25d4466148d824c5db5fdaccf7ab20342..a93732e6201f1521d118002da149476275014ae5 100644 (file)
--- a/drivers/staging/winbond/Makefile
+++ b/drivers/staging/winbond/Makefile
@@ -1,14 +1,16 @@
-       DRIVER_DIR=./linux
-
-w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35rx.o $(DRIVER_DIR)/wb35tx.o \
-       mds.o \
-       mlmetxrx.o \
-       mto.o   \
+w35und-objs :=                 \
+       mds.o                   \
+       mlmetxrx.o              \
+       mto.o                   \
        phy_calibration.o       \
        reg.o                   \
        rxisr.o                 \
+       wb35reg.o               \
+       wb35rx.o                \
+       wb35tx.o                \
        wbhal.o                 \
        wblinux.o               \
+       wbusb.o                 \
 
 
 obj-$(CONFIG_W35UND) += w35und.o

diff --git a/drivers/staging/winbond/linux/common.h b/drivers/staging/winbond/common.h
similarity index 100%
rename from drivers/staging/winbond/linux/common.h
rename to drivers/staging/winbond/common.h

diff --git a/drivers/staging/winbond/os_common.h b/drivers/staging/winbond/os_common.h
index e24ff41e871e07c8a5962b5664fcd570a6659290..2c276e3ab512e6ee9aba4b4db97c484df335bd2b 100644 (file)
--- a/drivers/staging/winbond/os_common.h
+++ b/drivers/staging/winbond/os_common.h
@@ -1,2 +1,2 @@
-#include "linux/sysdef.h"
+#include "sysdef.h"
 

diff --git a/drivers/staging/winbond/linux/sysdef.h b/drivers/staging/winbond/sysdef.h
similarity index 100%
rename from drivers/staging/winbond/linux/sysdef.h
rename to drivers/staging/winbond/sysdef.h

diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/wb35reg.c
similarity index 99%
rename from drivers/staging/winbond/linux/wb35reg.c
rename to drivers/staging/winbond/wb35reg.c
index 4c9fd2b62d745434af8533b5c7123ae1f5b0fb61..c74b3fdcbda0d87c6646a037ea16b0dc9f7f4380 100644 (file)
--- a/drivers/staging/winbond/linux/wb35reg.c
+++ b/drivers/staging/winbond/wb35reg.c
@@ -511,12 +511,12 @@ Wb35Reg_destroy(phw_data_t pHwData)
 
        // Wait for Reg operation completed
        do {
-               msleep(10);     // Delay for waiting function enter 940623.1.a
+               msleep(10); // Delay for waiting function enter 940623.1.a
        } while (reg->EP0vm_state != VM_STOP);
-       msleep(10);     // Delay for waiting function enter 940623.1.b
+       msleep(10);  // Delay for waiting function enter 940623.1.b
 
        // Release all the data in RegQueue
-       spin_lock_irq(&reg->EP0VM_spin_lock);
+       spin_lock_irq( &reg->EP0VM_spin_lock );
        reg_queue = reg->reg_first;
        while (reg_queue) {
                if (reg_queue == reg->reg_last)
@@ -524,7 +524,7 @@ Wb35Reg_destroy(phw_data_t pHwData)
                reg->reg_first = reg->reg_first->Next;
 
                urb = reg_queue->urb;
-               spin_unlock_irq(&reg->EP0VM_spin_lock);
+               spin_unlock_irq( &reg->EP0VM_spin_lock );
                if (urb) {
                        usb_free_urb(urb);
                        kfree(reg_queue);

diff --git a/drivers/staging/winbond/linux/wb35reg_f.h b/drivers/staging/winbond/wb35reg_f.h
similarity index 99%
rename from drivers/staging/winbond/linux/wb35reg_f.h
rename to drivers/staging/winbond/wb35reg_f.h
index 9a178b9fb6c110aa29889a4ba3eb2f9804b03e37..d97215a1eba8e1be9846aa250285d2c912de1948 100644 (file)
--- a/drivers/staging/winbond/linux/wb35reg_f.h
+++ b/drivers/staging/winbond/wb35reg_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35REG_F_H
 #define __WINBOND_WB35REG_F_H
 
-#include "../wbhal_s.h"
+#include "wbhal_s.h"
 
 //====================================
 // Interface function declare

diff --git a/drivers/staging/winbond/linux/wb35reg_s.h b/drivers/staging/winbond/wb35reg_s.h
similarity index 100%
rename from drivers/staging/winbond/linux/wb35reg_s.h
rename to drivers/staging/winbond/wb35reg_s.h

diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/wb35rx.c
similarity index 100%
rename from drivers/staging/winbond/linux/wb35rx.c
rename to drivers/staging/winbond/wb35rx.c

diff --git a/drivers/staging/winbond/linux/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h
similarity index 96%
rename from drivers/staging/winbond/linux/wb35rx_f.h
rename to drivers/staging/winbond/wb35rx_f.h
index 752eec7f0670f0769f2f19f951a1dafdd17b798f..9fb2e2aacf68ed25238175a20baee83b79ef7afd 100644 (file)
--- a/drivers/staging/winbond/linux/wb35rx_f.h
+++ b/drivers/staging/winbond/wb35rx_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35RX_F_H
 #define __WINBOND_WB35RX_F_H
 
-#include "../wbhal_s.h"
+#include "wbhal_s.h"
 
 //====================================
 // Interface function declare

diff --git a/drivers/staging/winbond/linux/wb35rx_s.h b/drivers/staging/winbond/wb35rx_s.h
similarity index 100%
rename from drivers/staging/winbond/linux/wb35rx_s.h
rename to drivers/staging/winbond/wb35rx_s.h

diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/wb35tx.c
similarity index 99%
rename from drivers/staging/winbond/linux/wb35tx.c
rename to drivers/staging/winbond/wb35tx.c
index ec0e7b922da929021814efc4a8c9498a5ba1e9cf..af4a61fdc0727a7153529c77e50223dfeee76371 100644 (file)
--- a/drivers/staging/winbond/linux/wb35tx.c
+++ b/drivers/staging/winbond/wb35tx.c
@@ -11,7 +11,7 @@
 #include <linux/usb.h>
 
 #include "wb35tx_f.h"
-#include "../mds_f.h"
+#include "mds_f.h"
 #include "sysdef.h"
 
 unsigned char

diff --git a/drivers/staging/winbond/linux/wb35tx_f.h b/drivers/staging/winbond/wb35tx_f.h
similarity index 96%
rename from drivers/staging/winbond/linux/wb35tx_f.h
rename to drivers/staging/winbond/wb35tx_f.h
index 64b11a190af18db5ed4a479ca087095e50c8261d..6aca4e99b91d030399c19ba6776d10ce5738156a 100644 (file)
--- a/drivers/staging/winbond/linux/wb35tx_f.h
+++ b/drivers/staging/winbond/wb35tx_f.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35TX_F_H
 #define __WINBOND_WB35TX_F_H
 
-#include "../wbhal_f.h"
+#include "wbhal_f.h"
 
 //====================================
 // Interface function declare

diff --git a/drivers/staging/winbond/linux/wb35tx_s.h b/drivers/staging/winbond/wb35tx_s.h
similarity index 98%
rename from drivers/staging/winbond/linux/wb35tx_s.h
rename to drivers/staging/winbond/wb35tx_s.h
index b6ff6fdbc374651e40e4fe01787ac3bbc04eba57..3960276cae682f2bab7b706398be9c784d629a87 100644 (file)
--- a/drivers/staging/winbond/linux/wb35tx_s.h
+++ b/drivers/staging/winbond/wb35tx_s.h
@@ -1,7 +1,7 @@
 #ifndef __WINBOND_WB35_TX_S_H
 #define __WINBOND_WB35_TX_S_H
 
-#include "../mds_s.h"
+#include "mds_s.h"
 
 //====================================
 // IS89C35 Tx related definition

diff --git a/drivers/staging/winbond/wbhal_f.h b/drivers/staging/winbond/wbhal_f.h
index ec66a9987523ad92128c3c6f08c5b659c4b58902..d64fd175dff9762868eee2438288df39153733de 100644 (file)
--- a/drivers/staging/winbond/wbhal_f.h
+++ b/drivers/staging/winbond/wbhal_f.h
@@ -1,9 +1,9 @@
 //=====================================================================
 // Device related include
 //=====================================================================
-#include "linux/wb35reg_f.h"
-#include "linux/wb35tx_f.h"
-#include "linux/wb35rx_f.h"
+#include "wb35reg_f.h"
+#include "wb35tx_f.h"
+#include "wb35rx_f.h"
 
 #include "adapter.h"
 

diff --git a/drivers/staging/winbond/wbhal_s.h b/drivers/staging/winbond/wbhal_s.h
index af99713b3145307823fb205ee8a196d1fa7850c3..995976a9d7d232fe3249de8f333ab35e840fc8a6 100644 (file)
--- a/drivers/staging/winbond/wbhal_s.h
+++ b/drivers/staging/winbond/wbhal_s.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 
-#include "linux/common.h"
+#include "common.h"
 
 //[20040722 WK]
 #define HAL_LED_SET_MASK               0x001c  //20060901 Extend
@@ -422,10 +422,10 @@ typedef struct _TXVGA_FOR_50 {
 // Device related include
 //=====================================================================
 
-#include "linux/wbusb_s.h"
-#include "linux/wb35reg_s.h"
-#include "linux/wb35tx_s.h"
-#include "linux/wb35rx_s.h"
+#include "wbusb_s.h"
+#include "wb35reg_s.h"
+#include "wb35tx_s.h"
+#include "wb35rx_s.h"
 
 
 // For Hal using ==================================================================

diff --git a/drivers/staging/winbond/linux/wbusb.c b/drivers/staging/winbond/wbusb.c
similarity index 98%
rename from drivers/staging/winbond/linux/wbusb.c
rename to drivers/staging/winbond/wbusb.c
index 861a0e4c70664a4980a5608a6b5e02c7fb6dba58..4af13a059608d5d50915b7757cacb3f3036afb05 100644 (file)
--- a/drivers/staging/winbond/linux/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -6,9 +6,9 @@
 #include <net/mac80211.h>
 #include <linux/usb.h>
 
-#include "../mlmetxrx_f.h"
-#include "../wbhal_f.h"
-#include "../wblinux_f.h"
+#include "mlmetxrx_f.h"
+#include "wbhal_f.h"
+#include "wblinux_f.h"
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -252,7 +252,7 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
        SET_IEEE80211_DEV(dev, &udev->dev);
        {
                phw_data_t pHwData = &adapter->sHwData;
-               unsigned char dev_addr[MAX_ADDR_LEN];
+               unsigned char           dev_addr[MAX_ADDR_LEN];
                hal_get_permanent_address(pHwData, dev_addr);
                SET_IEEE80211_PERM_ADDR(dev, dev_addr);
        }

diff --git a/drivers/staging/winbond/linux/wbusb_s.h b/drivers/staging/winbond/wbusb_s.h
similarity index 100%
rename from drivers/staging/winbond/linux/wbusb_s.h
rename to drivers/staging/winbond/wbusb_s.h