diff options
| author | Tair Rzayev <tair.rzayev@gmail.com> | 2014-05-04 11:44:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 21:32:28 +0900 |
| commit | 6026771417669c064fa20e3f3fd12aafcad1b37d (patch) | |
| tree | 459629321f6b00ed525641a1ae6ff5163a6f03e3 | |
| parent | 96211ca58a5d43e6cb527b2a110fbc5df4d15949 (diff) | |
| download | linux-stable-6026771417669c064fa20e3f3fd12aafcad1b37d.tar.gz linux-stable-6026771417669c064fa20e3f3fd12aafcad1b37d.tar.bz2 linux-stable-6026771417669c064fa20e3f3fd12aafcad1b37d.zip | |
staging: keucr: smilmain.c: cosmetic updates
* Move Check_D_MediaFmt() implementation up in smilmain.c to keep all the
non-static functions at the top of the file;
* Remove unnecessary extern and newlines from "init.h";
Signed-off-by: Tair Rzayev <tair.rzayev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/keucr/init.h | 4 | ||||
| -rw-r--r-- | drivers/staging/keucr/smilmain.c | 34 |
2 files changed, 17 insertions, 21 deletions
diff --git a/drivers/staging/keucr/init.h b/drivers/staging/keucr/init.h index 32c724df621d..d1367e726ff1 100644 --- a/drivers/staging/keucr/init.h +++ b/drivers/staging/keucr/init.h @@ -1,9 +1,5 @@ #include "common.h" -extern u32 MediaChange; - - - static u8 SM_Init[] = { 0x7B, 0x09, 0x7C, 0xF0, 0x7D, 0x10, 0x7E, 0xE9, 0x7F, 0xCC, 0x12, 0x2F, 0x71, 0x90, 0xE9, 0xCC, diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c index fc7cbc6f8a45..42ec8a669ad3 100644 --- a/drivers/staging/keucr/smilmain.c +++ b/drivers/staging/keucr/smilmain.c @@ -141,23 +141,6 @@ int Media_D_CopySector(struct us_data *us, u32 start, u16 count, u8 *buf) return NO_ERROR; } -/* ----- Release_D_CopySector() ------------------------------------------ */ -static int Release_D_CopySector(struct us_data *us) -{ - Log2Phy[Media.Zone][Media.LogBlock] = WriteBlock; - Media.PhyBlock = ReadBlock; - - if (Media.PhyBlock == NO_ASSIGN) { - Media.PhyBlock = WriteBlock; - return SMSUCCESS; - } - - Clr_D_Bit(Assign[Media.Zone], Media.PhyBlock); - Media.PhyBlock = WriteBlock; - - return SMSUCCESS; -} - /* SmartMedia Physical Format Test Subroutine */ /* ----- Check_D_MediaFmt() --------------------------------------------- */ int Check_D_MediaFmt(struct us_data *us) @@ -184,6 +167,23 @@ int Check_D_MediaFmt(struct us_data *us) return SMSUCCESS; } +/* ----- Release_D_CopySector() ------------------------------------------ */ +static int Release_D_CopySector(struct us_data *us) +{ + Log2Phy[Media.Zone][Media.LogBlock] = WriteBlock; + Media.PhyBlock = ReadBlock; + + if (Media.PhyBlock == NO_ASSIGN) { + Media.PhyBlock = WriteBlock; + return SMSUCCESS; + } + + Clr_D_Bit(Assign[Media.Zone], Media.PhyBlock); + Media.PhyBlock = WriteBlock; + + return SMSUCCESS; +} + /* SmartMedia Physical Address Control Subroutine */ /* ----- Conv_D_MediaAddr() --------------------------------------------- */ static int Conv_D_MediaAddr(struct us_data *us, u32 addr) |