tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

hwmon: (max6650) Introduce local 'dev' variable

This makes the code a bit easier to read.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

Guenter Roeck 71ba0f31 0b5e33b6

+12 -12
+12 -12
drivers/hwmon/max6650.c
··· 563 563 static int max6650_init_client(struct max6650_data *data, 564 564 struct i2c_client *client) 565 565 { 566 + struct device *dev = &client->dev; 566 567 int config; 567 568 int err = -EIO; 568 569 569 570 config = i2c_smbus_read_byte_data(client, MAX6650_REG_CONFIG); 570 571 571 572 if (config < 0) { 572 - dev_err(&client->dev, "Error reading config, aborting.\n"); 573 + dev_err(dev, "Error reading config, aborting.\n"); 573 574 return err; 574 575 } 575 576 ··· 584 583 config |= MAX6650_CFG_V12; 585 584 break; 586 585 default: 587 - dev_err(&client->dev, "illegal value for fan_voltage (%d)\n", 586 + dev_err(dev, "illegal value for fan_voltage (%d)\n", 588 587 fan_voltage); 589 588 } 590 589 591 - dev_info(&client->dev, "Fan voltage is set to %dV.\n", 590 + dev_info(dev, "Fan voltage is set to %dV.\n", 592 591 (config & MAX6650_CFG_V12) ? 12 : 5); 593 592 594 593 switch (prescaler) { ··· 614 613 | MAX6650_CFG_PRESCALER_16; 615 614 break; 616 615 default: 617 - dev_err(&client->dev, "illegal value for prescaler (%d)\n", 618 - prescaler); 616 + dev_err(dev, "illegal value for prescaler (%d)\n", prescaler); 619 617 } 620 618 621 - dev_info(&client->dev, "Prescaler is set to %d.\n", 619 + dev_info(dev, "Prescaler is set to %d.\n", 622 620 1 << (config & MAX6650_CFG_PRESCALER_MASK)); 623 621 624 622 /* ··· 627 627 */ 628 628 629 629 if ((config & MAX6650_CFG_MODE_MASK) == MAX6650_CFG_MODE_OFF) { 630 - dev_dbg(&client->dev, "Change mode to open loop, full off.\n"); 630 + dev_dbg(dev, "Change mode to open loop, full off.\n"); 631 631 config = (config & ~MAX6650_CFG_MODE_MASK) 632 632 | MAX6650_CFG_MODE_OPEN_LOOP; 633 633 if (i2c_smbus_write_byte_data(client, MAX6650_REG_DAC, 255)) { 634 - dev_err(&client->dev, "DAC write error, aborting.\n"); 634 + dev_err(dev, "DAC write error, aborting.\n"); 635 635 return err; 636 636 } 637 637 } 638 638 639 639 if (i2c_smbus_write_byte_data(client, MAX6650_REG_CONFIG, config)) { 640 - dev_err(&client->dev, "Config write error, aborting.\n"); 640 + dev_err(dev, "Config write error, aborting.\n"); 641 641 return err; 642 642 } 643 643 ··· 650 650 static int max6650_probe(struct i2c_client *client, 651 651 const struct i2c_device_id *id) 652 652 { 653 + struct device *dev = &client->dev; 653 654 struct max6650_data *data; 654 655 struct device *hwmon_dev; 655 656 int err; 656 657 657 - data = devm_kzalloc(&client->dev, sizeof(struct max6650_data), 658 - GFP_KERNEL); 658 + data = devm_kzalloc(dev, sizeof(struct max6650_data), GFP_KERNEL); 659 659 if (!data) 660 660 return -ENOMEM; 661 661 ··· 675 675 if (data->nr_fans == 4) 676 676 data->groups[1] = &max6651_group; 677 677 678 - hwmon_dev = devm_hwmon_device_register_with_groups(&client->dev, 678 + hwmon_dev = devm_hwmon_device_register_with_groups(dev, 679 679 client->name, data, 680 680 data->groups); 681 681 return PTR_ERR_OR_ZERO(hwmon_dev);