Skip to content

Commit

Permalink
drivers: w1: style corrections for parenthesis and braces
Browse files Browse the repository at this point in the history
Inserted whitespace between command and open parenthesis
at two locations. Removed new line between open brace and
command/declaration at two locations.

Signed-off-by: Ben Werbowyj <ben.werbowyj@gmail.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ben Werbowyj authored and Greg Kroah-Hartman committed Aug 31, 2016
1 parent 34924b2 commit d4c3f97
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/w1/slaves/w1_therm.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static int w1_therm_add_slave(struct w1_slave *sl)
static void w1_therm_remove_slave(struct w1_slave *sl)
{
int refcnt = atomic_sub_return(1, THERM_REFCNT(sl->family_data));
while(refcnt) {
while (refcnt) {
msleep(1000);
refcnt = atomic_read(THERM_REFCNT(sl->family_data));
}
Expand Down Expand Up @@ -151,8 +151,7 @@ static struct w1_family w1_therm_family_DS1825 = {
.fops = &w1_therm_fops,
};

struct w1_therm_family_converter
{
struct w1_therm_family_converter {
u8 broken;
u16 reserved;
struct w1_family *f;
Expand Down Expand Up @@ -293,7 +292,7 @@ static inline int w1_DS18B20_precision(struct device *device, int val)
uint8_t precision_bits;
uint8_t mask = 0x60;

if(val > 12 || val < 9) {
if (val > 12 || val < 9) {
pr_warn("Unsupported precision\n");
return -1;
}
Expand Down Expand Up @@ -439,8 +438,7 @@ static ssize_t w1_slave_show(struct device *device,
if (ret != 0)
goto post_unlock;

if(!sl->family_data)
{
if (!sl->family_data) {
ret = -ENODEV;
goto pre_unlock;
}
Expand Down

0 comments on commit d4c3f97

Please sign in to comment.