Skip to content

Commit

Permalink
staging: wlags49_h2: Remove MUL/DIV_BY_2
Browse files Browse the repository at this point in the history
Only used in one place, so just inline and get rid of the macro.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
David Kilroy authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent 4b7ad42 commit 85d5cb1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/wlags49_h2/hcf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3766,7 +3766,7 @@ download( IFBP ifbp, CFG_PROG_STRCT FAR *ltvp ) //Hermes-II
#if 0 //;? as long as the next if contains a hard coded 0, might as well leave it out even more obvious
if ( 0 /*len is definitely not want we want;?*/ && ltvp->mode == CFG_PROG_SEEPROM_READBACK ) {
OPW( HREG_PARAM_1, (hcf_16)(ltvp->nic_addr >> 16) );
OPW( HREG_PARAM_2, MUL_BY_2(ltvp->len - 4));
OPW( HREG_PARAM_2, (hcf_16)((ltvp->len - 4) << 1) );
//. . perform Hermes prog cmd with appropriate mode bits
rc = cmd_exe( ifbp, HCMD_PROGRAM | ltvp->mode, (hcf_16)ltvp->nic_addr );
//. . set up NIC RAM addressability according Resp0-1
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/wlags49_h2/hcfdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,6 @@ err: ;

#define LOF(x) (sizeof(x)/sizeof(hcf_16)-1)

#define MUL_BY_2( x ) ( (x) << 1 ) //used to multiply by 2
#define DIV_BY_2( x ) ( (x) >> 1 ) //used to divide by 2

//resolve problems on for some 16 bits compilers to create 32 bit values
#define MERGE_2( hw, lw ) ( ( ((hcf_32)(hw)) << 16 ) | ((hcf_16)(lw)) )

Expand Down

0 comments on commit 85d5cb1

Please sign in to comment.