iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: cxt1e1: cleanup mfg_template[] a bit

Browse Source 
1) Make it static.
2) Change it to u8 data instead of short.
3) This means we can memcpy() it to the correct location instead of
   using a for loop.
4) With memcpy() we can use the union member we want directly instead of
   copying to the generic .bytes union member.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2014-01-23 11:24:27 +03:00 committed by Greg Kroah-Hartman
parent 91eef3e2fe
commit 388abdac58
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/cxt1e1/pmc93x6_eeprom.c
View File

@ -90,7 +90,7 @@ static int ByteReverseBuilt = FALSE;
*------------------------------------------------------------------------ *------------------------------------------------------------------------
*/ */
short mfg_template[sizeof (FLD_TYPE2)] = static u8 mfg_template[sizeof(FLD_TYPE2)] =
{ {
PROM_FORMAT_TYPE2, /* type; */ PROM_FORMAT_TYPE2, /* type; */
0x00, 0x1A, /* length[2]; */ 0x00, 0x1A, /* length[2]; */
@ -491,13 +491,11 @@ pmc_init_seeprom (u_int32_t addr, u_int32_t serialNum)
PROMFORMAT buffer; /* Memory image of structure */ PROMFORMAT buffer; /* Memory image of structure */
u_int32_t crc; /* CRC of structure */ u_int32_t crc; /* CRC of structure */
time_t createTime; time_t createTime;
int i;
createTime = get_seconds (); createTime = get_seconds ();
/* use template data */ /* use template data */
for (i = 0; i < sizeof (FLD_TYPE2); ++i) memcpy(&buffer.fldType2, mfg_template, sizeof(buffer.fldType2));
buffer.bytes[i] = mfg_template[i];
/* Update serial number field in buffer */ /* Update serial number field in buffer */
pmcSetBuffValue (&buffer.fldType2.Serial[3], serialNum, 3); pmcSetBuffValue (&buffer.fldType2.Serial[3], serialNum, 3);