[U-Boot,1/2] 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>
---
 fs/ext2/dev.c |   82 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 43 insertions(+), 39 deletions(-)

Hi Anton,

> 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>
> ---
>  fs/ext2/dev.c |   82 ++++++++++++++++++++++++++++++---------------------------
>  1 files changed, 43 insertions(+), 39 deletions(-)
>
> diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
> index 3b49650..4365b3b 100644
> --- a/fs/ext2/dev.c
> +++ b/fs/ext2/dev.c
> @@ -31,7 +31,7 @@
>  static block_dev_desc_t *ext2fs_block_dev_desc;
>  static disk_partition_t part_info;
>  
> -int ext2fs_set_blk_dev (block_dev_desc_t * rbdd, int part)
> +int ext2fs_set_blk_dev(block_dev_desc_t *rbdd, int part)
>  {
>  	ext2fs_block_dev_desc = rbdd;
>  
> @@ -46,51 +46,55 @@ 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)) >=
> +	/*
> +	 *  Check partition boundaries
> +	 */
> +	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);
> +		/* errnum = ERR_OUTSIDE_PART; */
> +		printf(" ** %s read outside partition sector %d\n",
> +		       __func__,
> +		       sector);
> +		return 0;
>  	}
>  
> -/*
> - *  Get the read to the beginning of a partition.
> - */
> +	/*
> +	 *  Get the read to the beginning of a partition.
> +	 */
>  	sector += byte_offset >> SECTOR_BITS;
>  	byte_offset &= SECTOR_SIZE - 1;
>  
> -	debug (" <%d, %d, %d>\n", sector, byte_offset, byte_len);
> +	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;


So in contrast to your commit message you actually change the format of
the output (to the better IMHO).  It would have been better to split the
cleanup and the changes.  Being as it is, you should at least document
the consistency changes for the next round.

Apart from that:

Acked-by: Detlev Zundel <dzu@denx.de>

Cheers
  Detlev

Ack, you're right, I didn't mean to include the printf changes.  Sorry about
that, I will be more careful with the next patches.  Would it be best to
leave this patch as it is or split it up for the next version (if there is
one)?

Thanks,
    Anton

On Wed, Jun 29, 2011 at 5:13 AM, Detlev Zundel <dzu@denx.de> wrote:

> Hi Anton,
>
> > 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>
> > ---
> >  fs/ext2/dev.c |   82
> ++++++++++++++++++++++++++++++---------------------------
> >  1 files changed, 43 insertions(+), 39 deletions(-)
> >
> > diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
> > index 3b49650..4365b3b 100644
> > --- a/fs/ext2/dev.c
> > +++ b/fs/ext2/dev.c
> > @@ -31,7 +31,7 @@
> >  static block_dev_desc_t *ext2fs_block_dev_desc;
> >  static disk_partition_t part_info;
> >
> > -int ext2fs_set_blk_dev (block_dev_desc_t * rbdd, int part)
> > +int ext2fs_set_blk_dev(block_dev_desc_t *rbdd, int part)
> >  {
> >       ext2fs_block_dev_desc = rbdd;
> >
> > @@ -46,51 +46,55 @@ 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)) >=
> > +     /*
> > +      *  Check partition boundaries
> > +      */
> > +     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);
> > +             /* errnum = ERR_OUTSIDE_PART; */
> > +             printf(" ** %s read outside partition sector %d\n",
> > +                    __func__,
> > +                    sector);
> > +             return 0;
> >       }
> >
> > -/*
> > - *  Get the read to the beginning of a partition.
> > - */
> > +     /*
> > +      *  Get the read to the beginning of a partition.
> > +      */
> >       sector += byte_offset >> SECTOR_BITS;
> >       byte_offset &= SECTOR_SIZE - 1;
> >
> > -     debug (" <%d, %d, %d>\n", sector, byte_offset, byte_len);
> > +     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;
>
>
> So in contrast to your commit message you actually change the format of
> the output (to the better IMHO).  It would have been better to split the
> cleanup and the changes.  Being as it is, you should at least document
> the consistency changes for the next round.
>
> Apart from that:
>
> Acked-by: Detlev Zundel <dzu@denx.de>
>
> Cheers
>  Detlev
>
> --
> We support democracy, but that doesn't mean we have to support
> governments that get elected as a result of democracy.
>                                     -- George W. Bush - March 30, 2006
> --
> DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu@denx.de
>

Hi Anton,

> Ack, you're right, I didn't mean to include the printf changes.  Sorry about
> that, I will be more careful with the next patches.  Would it be best to
> leave this patch as it is or split it up for the next version (if there is
> one)?

IMHO this is a minor issue, so I'm fine with the patch as is if you
include the change in the commit text.

Thanks
  Detlev