diff options
author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2011-08-31 15:24:21 +0530 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:54 +0200 |
commit | 1a1e21d521940df262239aa5c7dd6cf04a3c27ed (patch) | |
tree | e9fae4dcb22c9e316bc6cb60a745b27dc8914acf | |
parent | c92e3e505ca2f76777bf847d317077c8b35f49d8 (diff) |
misc: fix the indentation of i2s driver
Ref: Commit-id: 1bf6aaf4907790f8f6c1cd3c09139d4831cfa2d1
Signed-off-by: Avinash A <Avinash.a@stericsson.com>
Change-Id: I7b4912ed35446c87b4a86b0a5c44ae8d43ceb794
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29794
Reviewed-by: Avinash A <avinash.a@stericsson.com>
Tested-by: Avinash A <avinash.a@stericsson.com>
-rwxr-xr-x[-rw-r--r--] | drivers/misc/i2s/Makefile | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | drivers/misc/i2s/i2s.c | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | drivers/misc/i2s/msp_i2s.h | 50 |
3 files changed, 30 insertions, 30 deletions
diff --git a/drivers/misc/i2s/Makefile b/drivers/misc/i2s/Makefile index 06cb51d7b30..75d361d5deb 100644..100755 --- a/drivers/misc/i2s/Makefile +++ b/drivers/misc/i2s/Makefile @@ -2,6 +2,6 @@ # Makefile for I2S drivers # -nmdk_i2s-objs := i2s.o +nmdk_i2s-objs := i2s.o obj-$(CONFIG_STM_I2S) += nmdk_i2s.o obj-$(CONFIG_STM_MSP_I2S) += msp_i2s.o diff --git a/drivers/misc/i2s/i2s.c b/drivers/misc/i2s/i2s.c index 8ee7492a4fa..b4c243b7cb2 100644..100755 --- a/drivers/misc/i2s/i2s.c +++ b/drivers/misc/i2s/i2s.c @@ -274,7 +274,7 @@ int i2s_add_device(struct i2s_device *i2s) else dev_dbg(dev, "registered child %s\n", dev_name(&i2s->dev)); - done: + done: mutex_unlock(&i2s_add_lock); return status; } @@ -449,7 +449,7 @@ static int i2s_register_controller(struct i2s_controller *cont) dev_dbg(&cont->dev, "controller [%s] registered\n", cont->name); scan_boardinfo(cont); - out_unlock: + out_unlock: mutex_unlock(&core_lock); return res; } @@ -612,9 +612,9 @@ static int __init i2s_init(void) goto err1; return 0; - err1: + err1: bus_unregister(&i2s_bus_type); - err0: + err0: return status; } diff --git a/drivers/misc/i2s/msp_i2s.h b/drivers/misc/i2s/msp_i2s.h index 2ac86e7700e..3fcb92867e2 100644..100755 --- a/drivers/misc/i2s/msp_i2s.h +++ b/drivers/misc/i2s/msp_i2s.h @@ -18,7 +18,7 @@ #ifndef STM_MSP_HEADER #define STM_MSP_HEADER -#define MSP_DR 0x00 +#define MSP_DR 0x00 #define MSP_GCR 0x04 #define MSP_TCF 0x08 #define MSP_RCF 0x0c @@ -27,22 +27,22 @@ #define MSP_DMACR 0x18 #define MSP_IMSC 0x20 -#define MSP_RI 0x24 -#define MSP_MIS 0x28 +#define MSP_RIS 0x24 +#define MSP_MIS 0x28 #define MSP_ICR 0x2c #define MSP_MCR 0x30 -#define MSP_RCV 0x34 -#define MSP_RCM 0x38 +#define MSP_RCV 0x34 +#define MSP_RCM 0x38 #define MSP_TCE0 0x40 #define MSP_TCE1 0x44 -#define MSP_TCE2 0x48 -#define MSP_TCE3 0x4c +#define MSP_TCE2 0x48 +#define MSP_TCE3 0x4c #define MSP_RCE0 0x60 #define MSP_RCE1 0x64 #define MSP_RCE2 0x68 -#define MSP_RCE3 0x6c +#define MSP_RCE3 0x6c #define MSP_ITCR 0x80 #define MSP_ITIP 0x84 @@ -51,13 +51,13 @@ #define MSP_PID0 0xfe0 #define MSP_PID1 0xfe4 -#define MSP_PID2 0xfe8 +#define MSP_PID2 0xfe8 #define MSP_PID3 0xfec #define MSP_CID0 0xff0 -#define MSP_CID1 0xff4 +#define MSP_CID1 0xff4 #define MSP_CID2 0xff8 -#define MSP_CID3 0xffc +#define MSP_CID3 0xffc /* Single or dual phase mode */ @@ -72,8 +72,8 @@ enum -----------------------------------*/ enum { - MSP_SxHIFTER_IDLE = 0, - MSP_SHIFTER_WORKING = 1 + MSP_SxHIFTER_IDLE = 0, + MSP_SHIFTER_WORKING = 1 }; @@ -121,10 +121,10 @@ enum ---------------------------------------*/ enum { - MSP_DELAY_0 = 0, - MSP_DELAY_1 = 1, - MSP_DELAY_2 = 2, - MSP_DELAY_3 = 3 + MSP_DELAY_0 = 0, + MSP_DELAY_1 = 1, + MSP_DELAY_2 = 2, + MSP_DELAY_3 = 3 }; @@ -139,14 +139,14 @@ enum /* Protocol dependant parameters list */ struct msp_protocol_desc { - u32 phase_mode; - u32 frame_len_1; - u32 frame_len_2; - u32 element_len_1; - u32 element_len_2; - u32 data_delay; - u32 tx_clock_edge; - u32 rx_clock_edge; + u32 phase_mode; + u32 frame_len_1; + u32 frame_len_2; + u32 element_len_1; + u32 element_len_2; + u32 data_delay; + u32 tx_clock_edge; + u32 rx_clock_edge; }; #define RX_ENABLE_MASK 0x00000001 #define RX_FIFO_ENABLE_MASK 0x00000002 |