Skip to content

L
linux-davinci
Commit cb636fe3 authored by Mithlesh Thukral's avatar Mithlesh Thukral Committed by Greg Kroah-Hartman
Browse files
Options

Staging: sxg: Indentation fixes - mostly 80 char lines 

Fix up the indentation to Linux style. There was some indentation which was
not as per Linux style specially related to 80 char lines.
Signed-off-by: default avatarLinSysSoft Sahara Team <saharaproj@linsyssoft.com>
Signed-off-by: default avatarChristopher Harrer <charrer@alacritech.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ddd6f0a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1264 additions and 966 deletions
drivers/staging/sxg/sxg.c
View file @ cb636fe3
This diff is collapsed.
drivers/staging/sxg/sxg.h
View file @ cb636fe3
This diff is collapsed.
drivers/staging/sxg/sxg_os.h
View file @ cb636fe3
...@@ -49,26 +49,26 @@ struct list_entry { ...@@ -49,26 +49,26 @@ struct list_entry {
struct list_entry *nle_blink; struct list_entry *nle_blink;
}; };
#define InitializeListHead(l) \ #define InitializeListHead(l) \
(l)->nle_flink = (l)->nle_blink = (l) (l)->nle_flink = (l)->nle_blink = (l)
#define IsListEmpty(h) \ #define IsListEmpty(h) \
((h)->nle_flink == (h)) ((h)->nle_flink == (h))
#define RemoveEntryList(e) \ #define RemoveEntryList(e) \
do { \ do { \
list_entry *b; \ list_entry *b; \
list_entry *f; \ list_entry *f; \
\ \
f = (e)->nle_flink; \ f = (e)->nle_flink; \
b = (e)->nle_blink; \ b = (e)->nle_blink; \
b->nle_flink = f; \ b->nle_flink = f; \
f->nle_blink = b; \ f->nle_blink = b; \
} while (0) } while (0)
/* These two have to be inlined since they return things. */ /* These two have to be inlined since they return things. */
static __inline struct list_entry *RemoveHeadList(struct list_entry *l) static inline struct list_entry *RemoveHeadList(struct list_entry *l)
{ {
struct list_entry *f; struct list_entry *f;
struct list_entry *e; struct list_entry *e;
...@@ -81,7 +81,7 @@ static __inline struct list_entry *RemoveHeadList(struct list_entry *l) ...@@ -81,7 +81,7 @@ static __inline struct list_entry *RemoveHeadList(struct list_entry *l)
return (e); return (e);
} }
static __inline struct list_entry *RemoveTailList(struct list_entry *l) static inline struct list_entry *RemoveTailList(struct list_entry *l)
{ {
struct list_entry *b; struct list_entry *b;
struct list_entry *e; struct list_entry *e;
...@@ -94,35 +94,35 @@ static __inline struct list_entry *RemoveTailList(struct list_entry *l) ...@@ -94,35 +94,35 @@ static __inline struct list_entry *RemoveTailList(struct list_entry *l)
return (e); return (e);
} }
#define InsertTailList(l, e) \ #define InsertTailList(l, e) \
do { \ do { \
struct list_entry *b; \ struct list_entry *b; \
\ \
b = (l)->nle_blink; \ b = (l)->nle_blink; \
(e)->nle_flink = (l); \ (e)->nle_flink = (l); \
(e)->nle_blink = b; \ (e)->nle_blink = b; \
b->nle_flink = (e); \ b->nle_flink = (e); \
(l)->nle_blink = (e); \ (l)->nle_blink = (e); \
} while (0) } while (0)
#define InsertHeadList(l, e) \ #define InsertHeadList(l, e) \
do { \ do { \
struct list_entry *f; \ struct list_entry *f; \
\ \
f = (l)->nle_flink; \ f = (l)->nle_flink; \
(e)->nle_flink = f; \ (e)->nle_flink = f; \
(e)->nle_blink = l; \ (e)->nle_blink = l; \
f->nle_blink = (e); \ f->nle_blink = (e); \
(l)->nle_flink = (e); \ (l)->nle_flink = (e); \
} while (0) } while (0)
#define ATK_DEBUG 1 #define ATK_DEBUG 1
#if ATK_DEBUG #if ATK_DEBUG
#define SLIC_TIMESTAMP(value) { \ #define SLIC_TIMESTAMP(value) { \
struct timeval timev; \ struct timeval timev; \
do_gettimeofday(&timev); \ do_gettimeofday(&timev); \
value = timev.tv_sec*1000000 + timev.tv_usec; \ value = timev.tv_sec*1000000 + timev.tv_usec; \
} }
#else #else
#define SLIC_TIMESTAMP(value) #define SLIC_TIMESTAMP(value)
...@@ -131,17 +131,19 @@ static __inline struct list_entry *RemoveTailList(struct list_entry *l) ...@@ -131,17 +131,19 @@ static __inline struct list_entry *RemoveTailList(struct list_entry *l)
/* SXG DEFINES */ /* SXG DEFINES */
#ifdef ATKDBG #ifdef ATKDBG
#define SXG_TIMESTAMP(value) { \ #define SXG_TIMESTAMP(value) { \
struct timeval timev; \ struct timeval timev; \
do_gettimeofday(&timev); \ do_gettimeofday(&timev); \
value = timev.tv_sec*1000000 + timev.tv_usec; \ value = timev.tv_sec*1000000 + timev.tv_usec; \
} }
#else #else
#define SXG_TIMESTAMP(value) #define SXG_TIMESTAMP(value)
#endif #endif
#define WRITE_REG(reg,value,flush) sxg_reg32_write((&reg), (value), (flush)) #define WRITE_REG(reg,value,flush) \
#define WRITE_REG64(a,reg,value,cpu) sxg_reg64_write((a),(&reg),(value),(cpu)) sxg_reg32_write((&reg), (value), (flush))
#define WRITE_REG64(a,reg,value,cpu) \
sxg_reg64_write((a),(&reg),(value),(cpu))
#define READ_REG(reg,value) (value) = readl((void __iomem *)(&reg)) #define READ_REG(reg,value) (value) = readl((void __iomem *)(&reg))
#endif /* _SLIC_OS_SPECIFIC_H_ */ #endif /* _SLIC_OS_SPECIFIC_H_ */
drivers/staging/sxg/sxgdbg.h
View file @ cb636fe3
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
#define SXG_ASSERT_ENABLED #define SXG_ASSERT_ENABLED
#ifdef SXG_ASSERT_ENABLED #ifdef SXG_ASSERT_ENABLED
#ifndef ASSERT #ifndef ASSERT
#define ASSERT(a) \ #define ASSERT(a) \
{ \ { \
if (!(a)) { \ if (!(a)) { \
DBG_ERROR("ASSERT() Failure: file %s, function %s line %d\n",\ DBG_ERROR("ASSERT() Failure: file %s, function %s line %d\n", \
__FILE__, __func__, __LINE__); \ __FILE__, __func__, __LINE__); \
} \ } \
} }
#endif #endif
#else #else
...@@ -88,16 +88,17 @@ extern ulong ATKTimerDiv; ...@@ -88,16 +88,17 @@ extern ulong ATKTimerDiv;
* parameters. * parameters.
*/ */
struct trace_entry { struct trace_entry {
char name[8]; /* 8 character name - like 's'i'm'b'a'r'c'v' */ char name[8];/* 8 character name - like 's'i'm'b'a'r'c'v' */
u32 time; /* Current clock tic */ u32 time; /* Current clock tic */
unsigned char cpu; /* Current CPU */ unsigned char cpu; /* Current CPU */
unsigned char irql; /* Current IRQL */ unsigned char irql; /* Current IRQL */
unsigned char driver; /* The driver which added the trace call */ unsigned char driver;/* The driver which added the trace call */
unsigned char pad2; /* pad to 4 byte boundary - will probably get used */ /* pad to 4 byte boundary - will probably get used */
u32 arg1; /* Caller arg1 */ unsigned char pad2;
u32 arg2; /* Caller arg2 */ u32 arg1; /* Caller arg1 */
u32 arg3; /* Caller arg3 */ u32 arg2; /* Caller arg2 */
u32 arg4; /* Caller arg4 */ u32 arg3; /* Caller arg3 */
u32 arg4; /* Caller arg4 */
}; };
/* Driver types for driver field in struct trace_entry */ /* Driver types for driver field in struct trace_entry */
...@@ -108,11 +109,12 @@ struct trace_entry { ...@@ -108,11 +109,12 @@ struct trace_entry {
#define TRACE_ENTRIES 1024 #define TRACE_ENTRIES 1024
struct sxg_trace_buffer { struct sxg_trace_buffer {
unsigned int size; /* aid for windbg extension */ /* aid for windbg extension */
unsigned int in; /* Where to add */ unsigned int size;
unsigned int level; /* Current Trace level */ unsigned int in; /* Where to add */
spinlock_t lock; /* For MP tracing */ unsigned int level; /* Current Trace level */
struct trace_entry entries[TRACE_ENTRIES];/* The circular buffer */ spinlock_t lock; /* For MP tracing */
struct trace_entry entries[TRACE_ENTRIES];/* The circular buffer */
}; };
/* /*
...@@ -143,22 +145,22 @@ struct sxg_trace_buffer { ...@@ -143,22 +145,22 @@ struct sxg_trace_buffer {
/*The trace macro. This is active only if ATK_TRACE_ENABLED is set. */ /*The trace macro. This is active only if ATK_TRACE_ENABLED is set. */
#if ATK_TRACE_ENABLED #if ATK_TRACE_ENABLED
#define SXG_TRACE(tdriver, buffer, tlevel, tname, a1, a2, a3, a4) { \ #define SXG_TRACE(tdriver, buffer, tlevel, tname, a1, a2, a3, a4) { \
if ((buffer) && ((buffer)->level >= (tlevel))) { \ if ((buffer) && ((buffer)->level >= (tlevel))) { \
unsigned int trace_irql = 0; /* ?????? FIX THIS */ \ unsigned int trace_irql = 0;/* ?????? FIX THIS */\
unsigned int trace_len; \ unsigned int trace_len; \
struct trace_entry *trace_entry; \ struct trace_entry *trace_entry; \
struct timeval timev; \ struct timeval timev; \
\ \
spin_lock(&(buffer)->lock); \ spin_lock(&(buffer)->lock); \
trace_entry = &(buffer)->entries[(buffer)->in]; \ trace_entry = &(buffer)->entries[(buffer)->in]; \
do_gettimeofday(&timev); \ do_gettimeofday(&timev); \
\ \
memset(trace_entry->name, 0, 8); \ memset(trace_entry->name, 0, 8); \
trace_len = strlen(tname); \ trace_len = strlen(tname); \
trace_len = trace_len > 8 ? 8 : trace_len; \ trace_len = trace_len > 8 ? 8 : trace_len; \
memcpy(trace_entry->name, (tname), trace_len); \ memcpy(trace_entry->name, (tname), trace_len); \
trace_entry->time = timev.tv_usec; \ trace_entry->time = timev.tv_usec; \
trace_entry->cpu = (unsigned char)(smp_processor_id() & 0xFF); \ trace_entry->cpu = (unsigned char)(smp_processor_id() & 0xFF);\
trace_entry->driver = (tdriver); \ trace_entry->driver = (tdriver); \
trace_entry->irql = trace_irql; \ trace_entry->irql = trace_irql; \
trace_entry->arg1 = (ulong)(a1); \ trace_entry->arg1 = (ulong)(a1); \
......
drivers/staging/sxg/sxghif.h
View file @ cb636fe3
This diff is collapsed.
drivers/staging/sxg/sxghw.h
View file @ cb636fe3
This diff is collapsed.
drivers/staging/sxg/sxgphycode.h
View file @ cb636fe3
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
* type of transceiver. * type of transceiver.
*/ */
/* Download for AEL2005C PHY with SR/LR transceiver (10GBASE-SR or 10GBASE-LR) */ /*
* Download for AEL2005C PHY with SR/LR transceiver
* (10GBASE-SR or 10GBASE-LR)
*/
static struct phy_ucode PhyUcode[] = { static struct phy_ucode PhyUcode[] = {
/* /*
* NOTE: An address of 0 is a special case. When the download routine * NOTE: An address of 0 is a special case. When the download routine
......
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