V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: ide: Correct various code style problems 

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

39
cmd/ide.c
View File

@ -58,13 +58,13 @@ struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#ifdef CONFIG_IDE_RESET #ifdef CONFIG_IDE_RESET
static void ide_reset (void); static void ide_reset(void);
#else #else
#define ide_reset() /* dummy */ #define ide_reset() /* dummy */
#endif #endif
static void ide_ident(struct blk_desc *dev_desc); static void ide_ident(struct blk_desc *dev_desc);
static uchar ide_wait (int dev, ulong t); static uchar ide_wait(int dev, ulong t);
#define IDE_TIME_OUT 2000 /* 2 sec timeout */ #define IDE_TIME_OUT 2000 /* 2 sec timeout */
@ -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)
@ -150,7 +151,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return CMD_RET_USAGE; return CMD_RET_USAGE;
case 3: case 3:
if (strncmp(argv[1], "dev", 3) == 0) { if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int) simple_strtoul(argv[2], NULL, 10); int dev = (int)simple_strtoul(argv[2], NULL, 10);
printf("\nIDE device %d: ", dev); printf("\nIDE device %d: ", dev);
if (dev >= CONFIG_SYS_IDE_MAXDEVICE) { if (dev >= CONFIG_SYS_IDE_MAXDEVICE) {
@ -169,7 +170,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return 0; return 0;
} else if (strncmp(argv[1], "part", 4) == 0) { } else if (strncmp(argv[1], "part", 4) == 0) {
int dev = (int) simple_strtoul(argv[2], NULL, 10); int dev = (int)simple_strtoul(argv[2], NULL, 10);
if (ide_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) { if (ide_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) {
part_print(&ide_dev_desc[dev]); part_print(&ide_dev_desc[dev]);
@ -194,12 +195,12 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
#ifdef CONFIG_SYS_64BIT_LBA #ifdef CONFIG_SYS_64BIT_LBA
lbaint_t blk = simple_strtoull(argv[3], NULL, 16); lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
printf("\nIDE read: device %d block # %lld, count %ld ... ", printf("\nIDE read: device %d block # %lld, count %ld...",
curr_device, blk, cnt); curr_device, blk, cnt);
#else #else
lbaint_t blk = simple_strtoul(argv[3], NULL, 16); lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
printf("\nIDE read: device %d block # %ld, count %ld ... ", printf("\nIDE read: device %d block # %ld, count %ld...",
curr_device, blk, cnt); curr_device, blk, cnt);
#endif #endif
@ -223,12 +224,12 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
#ifdef CONFIG_SYS_64BIT_LBA #ifdef CONFIG_SYS_64BIT_LBA
lbaint_t blk = simple_strtoull(argv[3], NULL, 16); lbaint_t blk = simple_strtoull(argv[3], NULL, 16);
printf("\nIDE write: device %d block # %lld, count %ld ... ", printf("\nIDE write: device %d block # %lld, count %ld...",
curr_device, blk, cnt); curr_device, blk, cnt);
#else #else
lbaint_t blk = simple_strtoul(argv[3], NULL, 16); lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
printf("\nIDE write: device %d block # %ld, count %ld ... ", printf("\nIDE write: device %d block # %ld, count %ld...",
curr_device, blk, cnt); curr_device, blk, cnt);
#endif #endif
n = ide_write(&ide_dev_desc[curr_device], blk, cnt, n = ide_write(&ide_dev_desc[curr_device], blk, cnt,
@ -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;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */