Commit ac1a3bfa authored by Michalis Pappas's avatar Michalis Pappas Committed by Greg Kroah-Hartman

staging: gdm72xx: Indentation and other whitespace fixes

Signed-off-by: default avatarMichalis Pappas <mpappas@fastmail.fm>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39c511f8
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
struct sdio_tx { struct sdio_tx {
struct list_head list; struct list_head list;
struct tx_cxt *tx_cxt; struct tx_cxt *tx_cxt;
u8 *buf; u8 *buf;
int len; int len;
void (*callback)(void *cb_data); void (*callback)(void *cb_data);
void *cb_data; void *cb_data;
}; };
...@@ -35,9 +33,7 @@ struct tx_cxt { ...@@ -35,9 +33,7 @@ struct tx_cxt {
struct list_head sdu_list; struct list_head sdu_list;
struct list_head hci_list; struct list_head hci_list;
struct timeval sdu_stamp; struct timeval sdu_stamp;
u8 *sdu_buf; u8 *sdu_buf;
spinlock_t lock; spinlock_t lock;
int can_send; int can_send;
int stop_sdu_tx; int stop_sdu_tx;
...@@ -46,7 +42,6 @@ struct tx_cxt { ...@@ -46,7 +42,6 @@ struct tx_cxt {
struct sdio_rx { struct sdio_rx {
struct list_head list; struct list_head list;
struct rx_cxt *rx_cxt; struct rx_cxt *rx_cxt;
void (*callback)(void *cb_data, void *data, int len); void (*callback)(void *cb_data, void *data, int len);
void *cb_data; void *cb_data;
}; };
...@@ -54,18 +49,14 @@ struct sdio_rx { ...@@ -54,18 +49,14 @@ struct sdio_rx {
struct rx_cxt { struct rx_cxt {
struct list_head free_list; struct list_head free_list;
struct list_head req_list; struct list_head req_list;
u8 *rx_buf; u8 *rx_buf;
spinlock_t lock; spinlock_t lock;
}; };
struct sdiowm_dev { struct sdiowm_dev {
struct sdio_func *func; struct sdio_func *func;
struct tx_cxt tx; struct tx_cxt tx;
struct rx_cxt rx; struct rx_cxt rx;
struct work_struct ws; struct work_struct ws;
}; };
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
#define TX_BUF_SIZE 2048 #define TX_BUF_SIZE 2048
#if defined(CONFIG_WIMAX_GDM72XX_WIMAX2) #if defined(CONFIG_WIMAX_GDM72XX_WIMAX2)
#define RX_BUF_SIZE (128*1024) /* For packet aggregation */ #define RX_BUF_SIZE (128*1024) /* For packet aggregation */
#else #else
......
...@@ -28,10 +28,8 @@ struct usb_tx { ...@@ -28,10 +28,8 @@ struct usb_tx {
struct list_head p_list; struct list_head p_list;
#endif #endif
struct tx_cxt *tx_cxt; struct tx_cxt *tx_cxt;
struct urb *urb; struct urb *urb;
u8 *buf; u8 *buf;
void (*callback)(void *cb_data); void (*callback)(void *cb_data);
void *cb_data; void *cb_data;
}; };
...@@ -43,17 +41,14 @@ struct tx_cxt { ...@@ -43,17 +41,14 @@ struct tx_cxt {
#if defined(CONFIG_WIMAX_GDM72XX_USB_PM) || defined(CONFIG_WIMAX_GDM72XX_K_MODE) #if defined(CONFIG_WIMAX_GDM72XX_USB_PM) || defined(CONFIG_WIMAX_GDM72XX_K_MODE)
struct list_head pending_list; struct list_head pending_list;
#endif #endif
spinlock_t lock; spinlock_t lock;
}; };
struct usb_rx { struct usb_rx {
struct list_head list; struct list_head list;
struct rx_cxt *rx_cxt; struct rx_cxt *rx_cxt;
struct urb *urb; struct urb *urb;
u8 *buf; u8 *buf;
void (*callback)(void *cb_data, void *data, int len); void (*callback)(void *cb_data, void *data, int len);
void *cb_data; void *cb_data;
}; };
...@@ -75,10 +70,8 @@ struct usbwm_dev { ...@@ -75,10 +70,8 @@ struct usbwm_dev {
int bw_switch; int bw_switch;
struct list_head list; struct list_head list;
#endif #endif
struct tx_cxt tx; struct tx_cxt tx;
struct rx_cxt rx; struct rx_cxt rx;
int padding; int padding;
}; };
......
...@@ -52,7 +52,6 @@ static struct { ...@@ -52,7 +52,6 @@ static struct {
struct sock *sock; struct sock *sock;
struct list_head evtq; struct list_head evtq;
spinlock_t evt_lock; spinlock_t evt_lock;
struct list_head freeq; struct list_head freeq;
struct work_struct ws; struct work_struct ws;
} wm_event; } wm_event;
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
struct phy_dev { struct phy_dev {
void *priv_dev; void *priv_dev;
struct net_device *netdev; struct net_device *netdev;
int (*send_func)(void *priv_dev, void *data, int len, int (*send_func)(void *priv_dev, void *data, int len,
void (*cb)(void *cb_data), void *cb_data); void (*cb)(void *cb_data), void *cb_data);
int (*rcv_func)(void *priv_dev, int (*rcv_func)(void *priv_dev,
...@@ -47,15 +46,11 @@ struct phy_dev { ...@@ -47,15 +46,11 @@ struct phy_dev {
struct nic { struct nic {
struct net_device *netdev; struct net_device *netdev;
struct phy_dev *phy_dev; struct phy_dev *phy_dev;
struct net_device_stats stats; struct net_device_stats stats;
struct data_s sdk_data[SIOC_DATA_MAX]; struct data_s sdk_data[SIOC_DATA_MAX];
#if defined(CONFIG_WIMAX_GDM72XX_QOS) #if defined(CONFIG_WIMAX_GDM72XX_QOS)
struct qos_cb_s qos; struct qos_cb_s qos;
#endif #endif
}; };
int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev); int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev);
......
...@@ -40,11 +40,9 @@ ...@@ -40,11 +40,9 @@
#define WIMAX_EXIT_IDLE 0x0106 #define WIMAX_EXIT_IDLE 0x0106
#define WIMAX_MODE_CHANGE 0x8108 #define WIMAX_MODE_CHANGE 0x8108
#define WIMAX_HANDOVER 0x8109 /* obsolete */ #define WIMAX_HANDOVER 0x8109 /* obsolete */
#define WIMAX_SCAN 0x010d #define WIMAX_SCAN 0x010d
#define WIMAX_SCAN_COMPLETE 0x810e #define WIMAX_SCAN_COMPLETE 0x810e
#define WIMAX_SCAN_RESULT 0x810f #define WIMAX_SCAN_RESULT 0x810f
#define WIMAX_CONNECT 0x0110 #define WIMAX_CONNECT 0x0110
#define WIMAX_CONNECT_START 0x8111 #define WIMAX_CONNECT_START 0x8111
#define WIMAX_CONNECT_COMPLETE 0x8112 #define WIMAX_CONNECT_COMPLETE 0x8112
...@@ -56,10 +54,8 @@ ...@@ -56,10 +54,8 @@
#define WIMAX_HO_COMPLETE 0x8118 #define WIMAX_HO_COMPLETE 0x8118
#define WIMAX_RADIO_STATE_IND 0x8119 #define WIMAX_RADIO_STATE_IND 0x8119
#define WIMAX_IP_RENEW_IND 0x811a #define WIMAX_IP_RENEW_IND 0x811a
#define WIMAX_DISCOVER_NSP 0x011d #define WIMAX_DISCOVER_NSP 0x011d
#define WIMAX_DISCOVER_NSP_RESULT 0x811e #define WIMAX_DISCOVER_NSP_RESULT 0x811e
#define WIMAX_SDU_TX_FLOW 0x8125 #define WIMAX_SDU_TX_FLOW 0x8125
/* Category 2 */ /* Category 2 */
...@@ -82,14 +78,13 @@ ...@@ -82,14 +78,13 @@
#define WIMAX_UL_IMAGE 0x0312 #define WIMAX_UL_IMAGE 0x0312
#define WIMAX_UL_IMAGE_RESULT 0x8313 #define WIMAX_UL_IMAGE_RESULT 0x8313
#define WIMAX_UL_IMAGE_STATUS 0x0314 #define WIMAX_UL_IMAGE_STATUS 0x0314
#define WIMAX_EVT_MODEM_REPORT 0x8325 #define WIMAX_EVT_MODEM_REPORT 0x8325
/* Category 0xF */ /* Category 0xF */
#define WIMAX_FSM_UPDATE 0x8F01 #define WIMAX_FSM_UPDATE 0x8F01
#define WIMAX_IF_UPDOWN 0x8F02 #define WIMAX_IF_UPDOWN 0x8F02
#define WIMAX_IF_UP 1 #define WIMAX_IF_UP 1
#define WIMAX_IF_DOWN 2 #define WIMAX_IF_DOWN 2
/* WIMAX mode */ /* WIMAX mode */
#define W_NULL 0 #define W_NULL 0
...@@ -141,7 +136,6 @@ ...@@ -141,7 +136,6 @@
#define T_OOZ_SCAN_INTERVAL (0x08 | (4 << 16)) #define T_OOZ_SCAN_INTERVAL (0x08 | (4 << 16))
#define T_IMEI (0x09 | (8 << 16)) #define T_IMEI (0x09 | (8 << 16))
#define T_PID (0x0a | (12 << 16)) #define T_PID (0x0a | (12 << 16))
#define T_CAPABILITY (0x1a | (4 << 16)) #define T_CAPABILITY (0x1a | (4 << 16))
#define T_RELEASE_NUMBER (0x1b | (4 << 16)) #define T_RELEASE_NUMBER (0x1b | (4 << 16))
#define T_DRIVER_REVISION (0x1c | (4 << 16)) #define T_DRIVER_REVISION (0x1c | (4 << 16))
...@@ -151,17 +145,14 @@ ...@@ -151,17 +145,14 @@
/* HANDOVER */ /* HANDOVER */
#define T_SCAN_INTERVAL (0x20 | (1 << 16)) #define T_SCAN_INTERVAL (0x20 | (1 << 16))
#define T_RSC_RETAIN_TIME (0x2f | (2 << 16)) #define T_RSC_RETAIN_TIME (0x2f | (2 << 16))
/* SLEEP */ /* SLEEP */
#define T_TYPE1_ISW (0x40 | (1 << 16)) #define T_TYPE1_ISW (0x40 | (1 << 16))
#define T_SLP_START_TO (0x4a | (2 << 16)) #define T_SLP_START_TO (0x4a | (2 << 16))
/* IDLE */ /* IDLE */
#define T_IDLE_MODE_TO (0x50 | (2 << 16)) #define T_IDLE_MODE_TO (0x50 | (2 << 16))
#define T_IDLE_START_TO (0x54 | (2 << 16)) #define T_IDLE_START_TO (0x54 | (2 << 16))
/* MONITOR */ /* MONITOR */
......
...@@ -81,9 +81,7 @@ struct wm_req_s { ...@@ -81,9 +81,7 @@ struct wm_req_s {
union { union {
char ifrn_name[IFNAMSIZ]; char ifrn_name[IFNAMSIZ];
} ifr_ifrn; } ifr_ifrn;
unsigned short cmd; unsigned short cmd;
unsigned short data_id; unsigned short data_id;
struct data_s data; struct data_s data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment