aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/winbond/Makefile14
-rw-r--r--drivers/staging/winbond/common.h (renamed from drivers/staging/winbond/linux/common.h)0
-rw-r--r--drivers/staging/winbond/os_common.h2
-rw-r--r--drivers/staging/winbond/sysdef.h (renamed from drivers/staging/winbond/linux/sysdef.h)0
-rw-r--r--drivers/staging/winbond/wb35reg.c (renamed from drivers/staging/winbond/linux/wb35reg.c)8
-rw-r--r--drivers/staging/winbond/wb35reg_f.h (renamed from drivers/staging/winbond/linux/wb35reg_f.h)2
-rw-r--r--drivers/staging/winbond/wb35reg_s.h (renamed from drivers/staging/winbond/linux/wb35reg_s.h)0
-rw-r--r--drivers/staging/winbond/wb35rx.c (renamed from drivers/staging/winbond/linux/wb35rx.c)0
-rw-r--r--drivers/staging/winbond/wb35rx_f.h (renamed from drivers/staging/winbond/linux/wb35rx_f.h)2
-rw-r--r--drivers/staging/winbond/wb35rx_s.h (renamed from drivers/staging/winbond/linux/wb35rx_s.h)0
-rw-r--r--drivers/staging/winbond/wb35tx.c (renamed from drivers/staging/winbond/linux/wb35tx.c)2
-rw-r--r--drivers/staging/winbond/wb35tx_f.h (renamed from drivers/staging/winbond/linux/wb35tx_f.h)2
-rw-r--r--drivers/staging/winbond/wb35tx_s.h (renamed from drivers/staging/winbond/linux/wb35tx_s.h)2
-rw-r--r--drivers/staging/winbond/wbhal_f.h6
-rw-r--r--drivers/staging/winbond/wbhal_s.h10
-rw-r--r--drivers/staging/winbond/wbusb.c (renamed from drivers/staging/winbond/linux/wbusb.c)8
-rw-r--r--drivers/staging/winbond/wbusb_s.h (renamed from drivers/staging/winbond/linux/wbusb_s.h)0
17 files changed, 30 insertions, 28 deletions
diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
index ed3180c25d44..a93732e6201f 100644
--- 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
index 2badc2984a38..2badc2984a38 100644
--- a/drivers/staging/winbond/linux/common.h
+++ b/drivers/staging/winbond/common.h
diff --git a/drivers/staging/winbond/os_common.h b/drivers/staging/winbond/os_common.h
index e24ff41e871e..2c276e3ab512 100644
--- 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
index 60e4c04f725b..60e4c04f725b 100644
--- a/drivers/staging/winbond/linux/sysdef.h
+++ b/drivers/staging/winbond/sysdef.h
diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/wb35reg.c
index 4c9fd2b62d74..c74b3fdcbda0 100644
--- 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
index 9a178b9fb6c1..d97215a1eba8 100644
--- 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
index 32ef4b8a2d2a..32ef4b8a2d2a 100644
--- a/drivers/staging/winbond/linux/wb35reg_s.h
+++ b/drivers/staging/winbond/wb35reg_s.h
diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/wb35rx.c
index 15a065047361..15a065047361 100644
--- a/drivers/staging/winbond/linux/wb35rx.c
+++ b/drivers/staging/winbond/wb35rx.c
diff --git a/drivers/staging/winbond/linux/wb35rx_f.h b/drivers/staging/winbond/wb35rx_f.h
index 752eec7f0670..9fb2e2aacf68 100644
--- 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
index f18350b41c44..f18350b41c44 100644
--- a/drivers/staging/winbond/linux/wb35rx_s.h
+++ b/drivers/staging/winbond/wb35rx_s.h
diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/wb35tx.c
index ec0e7b922da9..af4a61fdc072 100644
--- 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
index 64b11a190af1..6aca4e99b91d 100644
--- 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
index b6ff6fdbc374..3960276cae68 100644
--- 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 ec66a9987523..d64fd175dff9 100644
--- 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 af99713b3145..995976a9d7d2 100644
--- 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
index 861a0e4c7066..4af13a059608 100644
--- 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
index 1aa8ab10b625..1aa8ab10b625 100644
--- a/drivers/staging/winbond/linux/wbusb_s.h
+++ b/drivers/staging/winbond/wbusb_s.h
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.