hwmon: (lm80) Various cleanups

* Drop trailing whitespace
* Fold a long line
* Rename new_client to client
* Drop redundant initializations to 0
* Drop bogus comment

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

authored by Jean Delvare and committed by Mark M. Hoffman 6cc37ee5 1c138107

+24 -25
+24 -25
drivers/hwmon/lm80.c
··· 127 127 u16 alarms; /* Register encoding, combined */ 128 128 }; 129 129 130 - /* 130 + /* 131 131 * Functions declaration 132 132 */ 133 133 ··· 336 336 set_temp(os_max, temp_os_max, LM80_REG_TEMP_OS_MAX); 337 337 set_temp(os_hyst, temp_os_hyst, LM80_REG_TEMP_OS_HYST); 338 338 339 - static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) 339 + static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, 340 + char *buf) 340 341 { 341 342 struct lm80_data *data = lm80_update_device(dev); 342 343 return sprintf(buf, "%u\n", data->alarms); ··· 439 438 static int lm80_detect(struct i2c_adapter *adapter, int address, int kind) 440 439 { 441 440 int i, cur; 442 - struct i2c_client *new_client; 441 + struct i2c_client *client; 443 442 struct lm80_data *data; 444 443 int err = 0; 445 444 const char *name; ··· 455 454 goto exit; 456 455 } 457 456 458 - new_client = &data->client; 459 - i2c_set_clientdata(new_client, data); 460 - new_client->addr = address; 461 - new_client->adapter = adapter; 462 - new_client->driver = &lm80_driver; 463 - new_client->flags = 0; 457 + client = &data->client; 458 + i2c_set_clientdata(client, data); 459 + client->addr = address; 460 + client->adapter = adapter; 461 + client->driver = &lm80_driver; 464 462 465 463 /* Now, we do the remaining detection. It is lousy. */ 466 - if (lm80_read_value(new_client, LM80_REG_ALARM2) & 0xc0) 464 + if (lm80_read_value(client, LM80_REG_ALARM2) & 0xc0) 467 465 goto error_free; 468 466 for (i = 0x2a; i <= 0x3d; i++) { 469 - cur = i2c_smbus_read_byte_data(new_client, i); 470 - if ((i2c_smbus_read_byte_data(new_client, i + 0x40) != cur) 471 - || (i2c_smbus_read_byte_data(new_client, i + 0x80) != cur) 472 - || (i2c_smbus_read_byte_data(new_client, i + 0xc0) != cur)) 467 + cur = i2c_smbus_read_byte_data(client, i); 468 + if ((i2c_smbus_read_byte_data(client, i + 0x40) != cur) 469 + || (i2c_smbus_read_byte_data(client, i + 0x80) != cur) 470 + || (i2c_smbus_read_byte_data(client, i + 0xc0) != cur)) 473 471 goto error_free; 474 472 } 475 473 ··· 476 476 kind = lm80; 477 477 name = "lm80"; 478 478 479 - /* Fill in the remaining client fields and put it into the global list */ 480 - strlcpy(new_client->name, name, I2C_NAME_SIZE); 481 - data->valid = 0; 479 + /* Fill in the remaining client fields */ 480 + strlcpy(client->name, name, I2C_NAME_SIZE); 482 481 mutex_init(&data->update_lock); 483 482 484 483 /* Tell the I2C layer a new client has arrived */ 485 - if ((err = i2c_attach_client(new_client))) 484 + if ((err = i2c_attach_client(client))) 486 485 goto error_free; 487 486 488 487 /* Initialize the LM80 chip */ 489 - lm80_init_client(new_client); 488 + lm80_init_client(client); 490 489 491 490 /* A few vars need to be filled upon startup */ 492 - data->fan_min[0] = lm80_read_value(new_client, LM80_REG_FAN_MIN(1)); 493 - data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2)); 491 + data->fan_min[0] = lm80_read_value(client, LM80_REG_FAN_MIN(1)); 492 + data->fan_min[1] = lm80_read_value(client, LM80_REG_FAN_MIN(2)); 494 493 495 494 /* Register sysfs hooks */ 496 - if ((err = sysfs_create_group(&new_client->dev.kobj, &lm80_group))) 495 + if ((err = sysfs_create_group(&client->dev.kobj, &lm80_group))) 497 496 goto error_detach; 498 497 499 - data->hwmon_dev = hwmon_device_register(&new_client->dev); 498 + data->hwmon_dev = hwmon_device_register(&client->dev); 500 499 if (IS_ERR(data->hwmon_dev)) { 501 500 err = PTR_ERR(data->hwmon_dev); 502 501 goto error_remove; ··· 504 505 return 0; 505 506 506 507 error_remove: 507 - sysfs_remove_group(&new_client->dev.kobj, &lm80_group); 508 + sysfs_remove_group(&client->dev.kobj, &lm80_group); 508 509 error_detach: 509 - i2c_detach_client(new_client); 510 + i2c_detach_client(client); 510 511 error_free: 511 512 kfree(data); 512 513 exit: