w1: coding style cleanups in w1_io.c
This fixes a number of coding style issues I stubled over. Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
50db9d8e4c
commit
23c36c1aec
1 changed files with 8 additions and 8 deletions
|
@ -69,7 +69,7 @@ static u8 w1_touch_bit(struct w1_master *dev, int bit)
|
|||
return w1_read_bit(dev);
|
||||
else {
|
||||
w1_write_bit(dev, 0);
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -185,14 +185,14 @@ static u8 w1_read_bit(struct w1_master *dev)
|
|||
u8 w1_triplet(struct w1_master *dev, int bdir)
|
||||
{
|
||||
if (dev->bus_master->triplet)
|
||||
return(dev->bus_master->triplet(dev->bus_master->data, bdir));
|
||||
return dev->bus_master->triplet(dev->bus_master->data, bdir);
|
||||
else {
|
||||
u8 id_bit = w1_touch_bit(dev, 1);
|
||||
u8 comp_bit = w1_touch_bit(dev, 1);
|
||||
u8 retval;
|
||||
|
||||
if (id_bit && comp_bit)
|
||||
return(0x03); /* error */
|
||||
return 0x03; /* error */
|
||||
|
||||
if (!id_bit && !comp_bit) {
|
||||
/* Both bits are valid, take the direction given */
|
||||
|
@ -207,7 +207,7 @@ u8 w1_triplet(struct w1_master *dev, int bdir)
|
|||
w1_touch_bit(dev, bdir);
|
||||
else
|
||||
w1_write_bit(dev, bdir);
|
||||
return(retval);
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue