forked from Minki/linux
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>
This commit is contained in:
parent
96211ca58a
commit
6026771417
@ -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,
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user