Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c36c1a authored by Daniel Mack's avatar Daniel Mack Committed by Linus Torvalds
Browse files

w1: coding style cleanups in w1_io.c 



This fixes a number of coding style issues I stubled over.

Acked-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 50db9d8e

drivers/w1/w1_io.c

+8 −8
Original line number Diff line number Diff line
@@ -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;

	}

}