mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
ext2: Fix checkpatch violations
Fix all checkpatch violations in the low level Ext2 block device reading code. This is done in preparation for cleaning up the partial sector access code. Signed-off-by: Anton Staaf <robotboy@chromium.org> Cc: Andy Fleming <afleming@freescale.com> Acked-by: Detlev Zundel <dzu@denx.de>
This commit is contained in:
parent
c00e17c7fe
commit
9bac35f57b
1 changed files with 43 additions and 39 deletions
|
@ -46,23 +46,26 @@ int ext2fs_set_blk_dev (block_dev_desc_t * rbdd, int part)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
return (part_info.size);
|
||||
return part_info.size;
|
||||
}
|
||||
|
||||
|
||||
int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
|
||||
int ext2fs_devread(int sector, int byte_offset, int byte_len, char *buf)
|
||||
{
|
||||
char sec_buf[SECTOR_SIZE];
|
||||
unsigned block_len;
|
||||
|
||||
/*
|
||||
* Check partition boundaries
|
||||
*/
|
||||
if ((sector < 0)
|
||||
|| ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS)) >=
|
||||
if ((sector < 0) ||
|
||||
((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS)) >=
|
||||
part_info.size)) {
|
||||
/* errnum = ERR_OUTSIDE_PART; */
|
||||
printf (" ** ext2fs_devread() read outside partition sector %d\n", sector);
|
||||
return (0);
|
||||
printf(" ** %s read outside partition sector %d\n",
|
||||
__func__,
|
||||
sector);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -74,8 +77,9 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
|
|||
debug(" <%d, %d, %d>\n", sector, byte_offset, byte_len);
|
||||
|
||||
if (ext2fs_block_dev_desc == NULL) {
|
||||
printf ("** Invalid Block Device Descriptor (NULL)\n");
|
||||
return (0);
|
||||
printf(" ** %s Invalid Block Device Descriptor (NULL)\n",
|
||||
__func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (byte_offset != 0) {
|
||||
|
@ -84,8 +88,8 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
|
|||
block_read(ext2fs_block_dev_desc->dev,
|
||||
part_info.start + sector, 1,
|
||||
(unsigned long *) sec_buf) != 1) {
|
||||
printf (" ** ext2fs_devread() read error **\n");
|
||||
return (0);
|
||||
printf(" ** %s read error **\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
memcpy(buf, sec_buf + byte_offset,
|
||||
min(SECTOR_SIZE - byte_offset, byte_len));
|
||||
|
@ -116,8 +120,8 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
|
|||
block_len / SECTOR_SIZE,
|
||||
(unsigned long *) buf) !=
|
||||
block_len / SECTOR_SIZE) {
|
||||
printf (" ** ext2fs_devread() read error - block\n");
|
||||
return (0);
|
||||
printf(" ** %s read error - block\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
block_len = byte_len & ~(SECTOR_SIZE - 1);
|
||||
buf += block_len;
|
||||
|
@ -130,10 +134,10 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
|
|||
block_read(ext2fs_block_dev_desc->dev,
|
||||
part_info.start + sector, 1,
|
||||
(unsigned long *) sec_buf) != 1) {
|
||||
printf (" ** ext2fs_devread() read error - last part\n");
|
||||
return (0);
|
||||
printf(" ** %s read error - last part\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
memcpy(buf, sec_buf, byte_len);
|
||||
}
|
||||
return (1);
|
||||
return 1;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue