Commit b761cbb5 authored by Vikram Dhillon's avatar Vikram Dhillon Committed by Greg Kroah-Hartman

Staging: arlan: arlan.h: Fixed some style issues

Fixed some style issues in accordance with checkpatch.pl. Before the
patch contained "total: 2 errors, 186 warnings, 535 lines checked" and
now it has: total: 0 errors, 170 warnings. Most of the warnings that
remain now are the line over 80 chars ones.
Signed-off-by: default avatarVikram Dhillon <dhillonv10@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 491dbc8d
...@@ -318,7 +318,7 @@ extern struct arlan_conf_stru arlan_conf[MAX_ARLANS]; ...@@ -318,7 +318,7 @@ extern struct arlan_conf_stru arlan_conf[MAX_ARLANS];
struct TxParam { struct TxParam {
volatile short offset; volatile short offset;
volatile short length; volatile short length;
volatile u_char dest[6]; volatile u_char dest[6];
volatile unsigned char clear; volatile unsigned char clear;
volatile unsigned char retries; volatile unsigned char retries;
volatile unsigned char routing; volatile unsigned char routing;
...@@ -354,37 +354,37 @@ struct arlan_private { ...@@ -354,37 +354,37 @@ struct arlan_private {
unsigned long tx_last_sent; unsigned long tx_last_sent;
unsigned long tx_last_cleared; unsigned long tx_last_cleared;
unsigned long retransmissions; unsigned long retransmissions;
unsigned long interrupt_ack_requested; unsigned long interrupt_ack_requested;
spinlock_t lock; spinlock_t lock;
unsigned long waiting_command_mask; unsigned long waiting_command_mask;
unsigned long card_polling_interval; unsigned long card_polling_interval;
unsigned long last_command_buff_free_time; unsigned long last_command_buff_free_time;
int under_reset; int under_reset;
int under_config; int under_config;
int rx_command_given; int rx_command_given;
int tx_command_given; int tx_command_given;
unsigned long interrupt_processing_active; unsigned long interrupt_processing_active;
unsigned long last_rx_int_ack_time; unsigned long last_rx_int_ack_time;
unsigned long in_bytes; unsigned long in_bytes;
unsigned long out_bytes; unsigned long out_bytes;
unsigned long in_time; unsigned long in_time;
unsigned long out_time; unsigned long out_time;
unsigned long in_time10; unsigned long in_time10;
unsigned long out_time10; unsigned long out_time10;
unsigned long in_bytes10; unsigned long in_bytes10;
unsigned long out_bytes10; unsigned long out_bytes10;
int init_etherdev_alloc; int init_etherdev_alloc;
}; };
#define ARLAN_CLEAR 0x00 #define ARLAN_CLEAR 0x00
#define ARLAN_RESET 0x01 #define ARLAN_RESET 0x01
#define ARLAN_CHANNEL_ATTENTION 0x02 #define ARLAN_CHANNEL_ATTENTION 0x02
#define ARLAN_INTERRUPT_ENABLE 0x04 #define ARLAN_INTERRUPT_ENABLE 0x04
#define ARLAN_CLEAR_INTERRUPT 0x08 #define ARLAN_CLEAR_INTERRUPT 0x08
#define ARLAN_POWER 0x40 #define ARLAN_POWER 0x40
#define ARLAN_ACCESS 0x80 #define ARLAN_ACCESS 0x80
#define ARLAN_COM_CONF 0x01 #define ARLAN_COM_CONF 0x01
...@@ -445,8 +445,8 @@ struct arlan_private { ...@@ -445,8 +445,8 @@ struct arlan_private {
#define registrationBad(dev)\ #define registrationBad(dev)\
(( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode) > 0) && \ ((READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode) > 0) && \
( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0)) (READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0))
#define readControlRegister(dev)\ #define readControlRegister(dev)\
...@@ -461,9 +461,9 @@ struct arlan_private { ...@@ -461,9 +461,9 @@ struct arlan_private {
int cr; \ int cr; \
\ \
cr = readControlRegister(dev);\ cr = readControlRegister(dev);\
if (cr & ARLAN_CHANNEL_ATTENTION) { \ if (cr & ARLAN_CHANNEL_ATTENTION) \
writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\ writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
} else \ else \
writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\ writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
} }
...@@ -504,8 +504,8 @@ struct arlan_private { ...@@ -504,8 +504,8 @@ struct arlan_private {
#define ARLAN_COMMAND_RX_ABORT 0x000080 #define ARLAN_COMMAND_RX_ABORT 0x000080
#define ARLAN_COMMAND_POWERDOWN 0x000100 #define ARLAN_COMMAND_POWERDOWN 0x000100
#define ARLAN_COMMAND_POWERUP 0x000200 #define ARLAN_COMMAND_POWERUP 0x000200
#define ARLAN_COMMAND_SLOW_POLL 0x000400 #define ARLAN_COMMAND_SLOW_POLL 0x000400
#define ARLAN_COMMAND_ACTIVATE 0x000800 #define ARLAN_COMMAND_ACTIVATE 0x000800
#define ARLAN_COMMAND_INT_ACK 0x001000 #define ARLAN_COMMAND_INT_ACK 0x001000
#define ARLAN_COMMAND_INT_ENABLE 0x002000 #define ARLAN_COMMAND_INT_ENABLE 0x002000
#define ARLAN_COMMAND_WAIT_NOW 0x004000 #define ARLAN_COMMAND_WAIT_NOW 0x004000
......
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