From: Yash Shah <[email protected]>
Fixed code indentation warning as detected by checkpatch.pl.
Signed-off-by: Yash Shah <[email protected]>
---
drivers/staging/rts5208/ms.c | 5 ++---
drivers/staging/rts5208/sd.c | 10 ++++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c
index ee818b0..cdaa1ab 100644
--- a/drivers/staging/rts5208/ms.c
+++ b/drivers/staging/rts5208/ms.c
@@ -1121,11 +1121,10 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
#ifdef SUPPORT_MSXC
if ((buf[cur_addr_off + 8] == 0x10) ||
- (buf[cur_addr_off + 8] == 0x13))
+ (buf[cur_addr_off + 8] == 0x13)) {
#else
- if (buf[cur_addr_off + 8] == 0x10)
+ if (buf[cur_addr_off + 8] == 0x10) {
#endif
- {
sys_info_addr = ((u32)buf[cur_addr_off + 0] << 24) |
((u32)buf[cur_addr_off + 1] << 16) |
((u32)buf[cur_addr_off + 2] << 8) |
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index cb41579..d6c4982 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -246,11 +246,10 @@ RTY_SEND_CMD:
}
}
#ifdef SUPPORT_SD_LOCK
- if (ptr[1] & 0x7D)
+ if (ptr[1] & 0x7D) {
#else
- if (ptr[1] & 0x7F)
+ if (ptr[1] & 0x7F) {
#endif
- {
dev_dbg(rtsx_dev(chip), "ptr[1]: 0x%02x\n",
ptr[1]);
rtsx_trace(chip);
@@ -4148,11 +4147,10 @@ RTY_SEND_CMD:
}
}
#ifdef SUPPORT_SD_LOCK
- if (ptr[1] & 0x7D)
+ if (ptr[1] & 0x7D) {
#else
- if (ptr[1] & 0x7F)
+ if (ptr[1] & 0x7F) {
#endif
- {
rtsx_trace(chip);
return STATUS_FAIL;
}
--
1.9.1
On Mon, Aug 03, 2015 at 11:18:31AM +0000, Shah, Yash (Y.) wrote:
> From: Yash Shah <[email protected]>
>
> Fixed code indentation warning as detected by checkpatch.pl.
>
> Signed-off-by: Yash Shah <[email protected]>
Defines aren't allowed in .c files anyway.
regards,
dan carpenter
On Mon, 2015-08-03 at 14:33 +0300, Dan Carpenter wrote:
> On Mon, Aug 03, 2015 at 11:18:31AM +0000, Shah, Yash (Y.) wrote:
> > From: Yash Shah <[email protected]>
> >
> > Fixed code indentation warning as detected by checkpatch.pl.
> >
> > Signed-off-by: Yash Shah <[email protected]>
>
> Defines aren't allowed in .c files anyway.
The kernel source tree disagrees with you
$ git grep "^\s*#\s*define\b" -- "*.c" | wc -l
175830
On Mon, Aug 03, 2015 at 04:41:40AM -0700, Joe Perches wrote:
> On Mon, 2015-08-03 at 14:33 +0300, Dan Carpenter wrote:
> > On Mon, Aug 03, 2015 at 11:18:31AM +0000, Shah, Yash (Y.) wrote:
> > > From: Yash Shah <[email protected]>
> > >
> > > Fixed code indentation warning as detected by checkpatch.pl.
> > >
> > > Signed-off-by: Yash Shah <[email protected]>
> >
> > Defines aren't allowed in .c files anyway.
>
> The kernel source tree disagrees with you
>
> $ git grep "^\s*#\s*define\b" -- "*.c" | wc -l
> 175830
Duh. Sorry. I meant ifdefs. I'm sure you can find lots of examples
of those too, but this code would be cleaner without the ifdefs.
regards,
dan carpenter
On Mon, 2015-08-03 at 15:09 +0300, Dan Carpenter wrote:
> On Mon, Aug 03, 2015 at 04:41:40AM -0700, Joe Perches wrote:
> > On Mon, 2015-08-03 at 14:33 +0300, Dan Carpenter wrote:
> > > On Mon, Aug 03, 2015 at 11:18:31AM +0000, Shah, Yash (Y.) wrote:
> > > > From: Yash Shah <[email protected]>
> > > >
> > > > Fixed code indentation warning as detected by checkpatch.pl.
> > > >
> > > > Signed-off-by: Yash Shah <[email protected]>
> > >
> > > Defines aren't allowed in .c files anyway.
> >
> > The kernel source tree disagrees with you
> >
> > $ git grep "^\s*#\s*define\b" -- "*.c" | wc -l
> > 175830
>
> Duh. Sorry. I meant ifdefs. I'm sure you can find lots of examples
> of those too,
Yeah, no worries, only about 30k of those.
> but this code would be cleaner without the ifdefs.
Very true. Removing these would be good.