summaryrefslogtreecommitdiffstats
path: root/drivers/staging/dt3155/dt3155_io.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-12-22 15:19:21 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:33 -0800
commit8c6356e2a57044614799de3f1e7f40561724893a (patch)
tree7a3c2387e7712fcdf74f68d5630d7ee819a84383 /drivers/staging/dt3155/dt3155_io.h
parent1769fd86e13eadeca64881fb8494a17afeccbbbf (diff)
downloadop-kernel-dev-8c6356e2a57044614799de3f1e7f40561724893a.zip
op-kernel-dev-8c6356e2a57044614799de3f1e7f40561724893a.tar.gz
Staging: dt3155: coding style cleanups for the .h files
This cleans up some of the coding style issues in the .h files. More remains to be done. Cc: Scott Smedley <ss@aao.gov.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/dt3155/dt3155_io.h')
-rw-r--r--drivers/staging/dt3155/dt3155_io.h73
1 files changed, 35 insertions, 38 deletions
diff --git a/drivers/staging/dt3155/dt3155_io.h b/drivers/staging/dt3155/dt3155_io.h
index c1174ab..67df27f 100644
--- a/drivers/staging/dt3155/dt3155_io.h
+++ b/drivers/staging/dt3155/dt3155_io.h
@@ -1,7 +1,7 @@
/*
Copyright 1996,2002 Gregory D. Hager, Alfred A. Rizzi, Noah J. Cowan,
- Jason Lapenta, Scott Smedley
+ Jason Lapenta, Scott Smedley
This file is part of the DT3155 Device Driver.
@@ -36,8 +36,8 @@ MA 02111-1307 USA
/* macros to access registers */
-#define WriteMReg(Address, Data) * ((u_long *) (Address)) = Data
-#define ReadMReg(Address, Data) Data = * ((u_long *) (Address))
+#define WriteMReg(Address, Data) (*((u_long *)(Address)) = Data)
+#define ReadMReg(Address, Data) (Data = *((u_long *)(Address)))
/***************** 32 bit register globals **************/
@@ -240,12 +240,11 @@ typedef union iic_csr2_tag {
* dma_upper_lmt_tag
*/
typedef union dma_upper_lmt_tag {
- u_long reg;
- struct
- {
- u_long DMA_UPPER_LMT_VAL : 24;
- u_long : 8;
- } fld;
+ u_long reg;
+ struct {
+ u_long DMA_UPPER_LMT_VAL:24;
+ u_long :8;
+ } fld;
} DMA_UPPER_LMT_R;
@@ -253,12 +252,12 @@ typedef union dma_upper_lmt_tag {
* Global declarations of local copies
* of boards' 32 bit registers
***************************************/
-extern u_long even_dma_start_r; /* bit 0 should always be 0 */
-extern u_long odd_dma_start_r; /* .. */
-extern u_long even_dma_stride_r; /* bits 0&1 should always be 0 */
-extern u_long odd_dma_stride_r; /* .. */
-extern u_long even_pixel_fmt_r;
-extern u_long odd_pixel_fmt_r;
+extern u_long even_dma_start_r; /* bit 0 should always be 0 */
+extern u_long odd_dma_start_r; /* .. */
+extern u_long even_dma_stride_r; /* bits 0&1 should always be 0 */
+extern u_long odd_dma_stride_r; /* .. */
+extern u_long even_pixel_fmt_r;
+extern u_long odd_pixel_fmt_r;
extern FIFO_TRIGGER_R fifo_trigger_r;
extern XFER_MODE_R xfer_mode_r;
@@ -266,8 +265,8 @@ extern CSR1_R csr1_r;
extern RETRY_WAIT_CNT_R retry_wait_cnt_r;
extern INT_CSR_R int_csr_r;
-extern u_long even_fld_mask_r;
-extern u_long odd_fld_mask_r;
+extern u_long even_fld_mask_r;
+extern u_long odd_fld_mask_r;
extern MASK_LENGTH_R mask_length_r;
extern FIFO_FLAG_CNT_R fifo_flag_cnt_r;
@@ -301,28 +300,26 @@ extern DMA_UPPER_LMT_R odd_dma_upper_lmt_r;
/******** Assignments and Typedefs for 8 bit I2C Registers********************/
typedef union i2c_csr2_tag {
- u_char reg;
- struct
- {
- u_char CHROM_FIL : 1;
- u_char SYNC_SNTL : 1;
- u_char HZ50 : 1;
- u_char SYNC_PRESENT : 1;
- u_char BUSY_EVE : 1;
- u_char BUSY_ODD : 1;
- u_char DISP_PASS : 1;
- } fld;
+ u_char reg;
+ struct {
+ u_char CHROM_FIL:1;
+ u_char SYNC_SNTL:1;
+ u_char HZ50:1;
+ u_char SYNC_PRESENT:1;
+ u_char BUSY_EVE:1;
+ u_char BUSY_ODD:1;
+ u_char DISP_PASS:1;
+ } fld;
} I2C_CSR2;
typedef union i2c_even_csr_tag {
- u_char reg;
- struct
- {
- u_char DONE_EVE : 1;
- u_char SNGL_EVE : 1;
- u_char ERROR_EVE : 1;
- u_char : 5;
- } fld;
+ u_char reg;
+ struct {
+ u_char DONE_EVE:1;
+ u_char SNGL_EVE:1;
+ u_char ERROR_EVE:1;
+ u_char :5;
+ } fld;
} I2C_EVEN_CSR;
typedef union i2c_odd_csr_tag {
@@ -394,7 +391,7 @@ extern u_char i2c_pm_lut_data;
/* access 8-bit IIC registers */
-extern int ReadI2C (u_char * lpReg, u_short wIregIndex, u_char * byVal);
-extern int WriteI2C (u_char * lpReg, u_short wIregIndex, u_char byVal);
+extern int ReadI2C(u_char *lpReg, u_short wIregIndex, u_char *byVal);
+extern int WriteI2C(u_char *lpReg, u_short wIregIndex, u_char byVal);
#endif
OpenPOWER on IntegriCloud