Commit 60267714 authored by Tair Rzayev's avatar Tair Rzayev Committed by Greg Kroah-Hartman

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: default avatarTair Rzayev <tair.rzayev@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96211ca5
#include "common.h" #include "common.h"
extern u32 MediaChange;
static u8 SM_Init[] = { static u8 SM_Init[] = {
0x7B, 0x09, 0x7C, 0xF0, 0x7D, 0x10, 0x7E, 0xE9, 0x7B, 0x09, 0x7C, 0xF0, 0x7D, 0x10, 0x7E, 0xE9,
0x7F, 0xCC, 0x12, 0x2F, 0x71, 0x90, 0xE9, 0xCC, 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) ...@@ -141,23 +141,6 @@ int Media_D_CopySector(struct us_data *us, u32 start, u16 count, u8 *buf)
return NO_ERROR; 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 */ /* SmartMedia Physical Format Test Subroutine */
/* ----- Check_D_MediaFmt() --------------------------------------------- */ /* ----- Check_D_MediaFmt() --------------------------------------------- */
int Check_D_MediaFmt(struct us_data *us) int Check_D_MediaFmt(struct us_data *us)
...@@ -184,6 +167,23 @@ int Check_D_MediaFmt(struct us_data *us) ...@@ -184,6 +167,23 @@ int Check_D_MediaFmt(struct us_data *us)
return SMSUCCESS; 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 */ /* SmartMedia Physical Address Control Subroutine */
/* ----- Conv_D_MediaAddr() --------------------------------------------- */ /* ----- Conv_D_MediaAddr() --------------------------------------------- */
static int Conv_D_MediaAddr(struct us_data *us, u32 addr) static int Conv_D_MediaAddr(struct us_data *us, u32 addr)
......
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