GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: ide: Correct various code style problems

Browse source 
Adjust common/ide.c so that it passes most checkpatch.pl checks.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-05-01 11:35:59 -06:00
parent f1d4d9379e
commit 53dbcdd0cd
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmd/ide.c
View file

@ -72,7 +72,8 @@ static uchar ide_wait (int dev, ulong t);
#define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */ #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */
static void ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len); static void ident_cpy(unsigned char *dest, unsigned char *src,
unsigned int len);
#ifndef CONFIG_SYS_ATA_PORT_ADDR #ifndef CONFIG_SYS_ATA_PORT_ADDR
#define CONFIG_SYS_ATA_PORT_ADDR(port) (port) #define CONFIG_SYS_ATA_PORT_ADDR(port) (port)
@ -833,7 +834,7 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
} }
IDE_READ_E: IDE_READ_E:
ide_led(DEVICE_LED(device), 0); /* LED off */ ide_led(DEVICE_LED(device), 0); /* LED off */
return (n); return n;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -922,7 +923,7 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
} }
WR_OUT: WR_OUT:
ide_led(DEVICE_LED(device), 0); /* LED off */ ide_led(DEVICE_LED(device), 0); /* LED off */
return (n); return n;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -974,7 +975,7 @@ static uchar ide_wait(int dev, ulong t)
if (delay-- == 0) if (delay-- == 0)
break; break;
} }
return (c); return c;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -1098,7 +1099,7 @@ static uchar atapi_wait_mask(int dev, ulong t, uchar mask, uchar res)
if (delay-- == 0) if (delay-- == 0)
break; break;
} }
return (c); return c;
} }
/* /*
@ -1220,7 +1221,7 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
} }
AI_OUT: AI_OUT:
ide_led(DEVICE_LED(device), 0); /* LED off */ ide_led(DEVICE_LED(device), 0); /* LED off */
return (err); return err;
} }
/* /*
@ -1297,7 +1298,7 @@ retry:
ascq); ascq);
error: error:
debug("ERROR Sense key %02X ASC %02X ASCQ %02X\n", key, asc, ascq); debug("ERROR Sense key %02X ASC %02X ASCQ %02X\n", key, asc, ascq);
return (0xFF); return 0xFF;
} }
@ -1402,8 +1403,8 @@ ulong atapi_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
unsigned char ccb[12]; /* Command descriptor block */ unsigned char ccb[12]; /* Command descriptor block */
ulong cnt; ulong cnt;
debug("atapi_read dev %d start " LBAF " blocks " LBAF " buffer at %lX\n", debug("atapi_read dev %d start " LBAF " blocks " LBAF
device, blknr, blkcnt, (ulong) buffer); " buffer at %lX\n", device, blknr, blkcnt, (ulong) buffer);
do { do {
if (blkcnt > ATAPI_READ_MAX_BLOCK) if (blkcnt > ATAPI_READ_MAX_BLOCK)
@ -1428,14 +1429,14 @@ ulong atapi_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
(unsigned char *) buffer, (unsigned char *) buffer,
cnt * ATAPI_READ_BLOCK_SIZE) cnt * ATAPI_READ_BLOCK_SIZE)
== 0xFF) { == 0xFF) {
return (n); return n;
} }
n += cnt; n += cnt;
blkcnt -= cnt; blkcnt -= cnt;
blknr += cnt; blknr += cnt;
buffer += (cnt * ATAPI_READ_BLOCK_SIZE); buffer += (cnt * ATAPI_READ_BLOCK_SIZE);
} while (blkcnt > 0); } while (blkcnt > 0);
return (n); return n;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */