aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/f71882fg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 68f5102110b1..b4ff0f9a6af0 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -384,7 +384,7 @@ static struct f71882fg_data *f71882fg_update_device(struct device * dev)
384 } 384 }
385 385
386 /* Update every second */ 386 /* Update every second */
387 if (time_after(jiffies, data->last_updated + HZ) || !data->valid) { 387 if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
388 data->temp_status = f71882fg_read8(data, 388 data->temp_status = f71882fg_read8(data,
389 F71882FG_REG_TEMP_STATUS); 389 F71882FG_REG_TEMP_STATUS);
390 data->temp_diode_open = f71882fg_read8(data, 390 data->temp_diode_open = f71882fg_read8(data,
@@ -614,7 +614,7 @@ static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute
614 data->temp_hyst[nr] = val; 614 data->temp_hyst[nr] = val;
615 615
616 /* convert value to register contents */ 616 /* convert value to register contents */
617 switch(nr) { 617 switch (nr) {
618 case 0: 618 case 0:
619 val = val << 4; 619 val = val << 4;
620 break; 620 break;
@@ -748,7 +748,7 @@ static int __devinit f71882fg_probe(struct platform_device * pdev)
748 int err, i; 748 int err, i;
749 u8 start_reg; 749 u8 start_reg;
750 750
751 if(!(data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL))) 751 if (!(data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL)))
752 return -ENOMEM; 752 return -ENOMEM;
753 753
754 data->addr = platform_get_resource(pdev, IORESOURCE_IO, 0)->start; 754 data->addr = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
@@ -850,7 +850,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address)
850 } 850 }
851 851
852 superio_select(sioaddr, SIO_F71882FG_LD_HWM); 852 superio_select(sioaddr, SIO_F71882FG_LD_HWM);
853 if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) { 853 if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
854 printk(KERN_WARNING DRVNAME ": Device not activated\n"); 854 printk(KERN_WARNING DRVNAME ": Device not activated\n");
855 goto exit; 855 goto exit;
856 } 856 }
@@ -890,18 +890,18 @@ static int __init f71882fg_device_add(unsigned short address)
890 int err; 890 int err;
891 891
892 f71882fg_pdev = platform_device_alloc(DRVNAME, address); 892 f71882fg_pdev = platform_device_alloc(DRVNAME, address);
893 if(!f71882fg_pdev) 893 if (!f71882fg_pdev)
894 return -ENOMEM; 894 return -ENOMEM;
895 895
896 res.name = f71882fg_pdev->name; 896 res.name = f71882fg_pdev->name;
897 err = platform_device_add_resources(f71882fg_pdev, &res, 1); 897 err = platform_device_add_resources(f71882fg_pdev, &res, 1);
898 if(err) { 898 if (err) {
899 printk(KERN_ERR DRVNAME ": Device resource addition failed\n"); 899 printk(KERN_ERR DRVNAME ": Device resource addition failed\n");
900 goto exit_device_put; 900 goto exit_device_put;
901 } 901 }
902 902
903 err = platform_device_add(f71882fg_pdev); 903 err = platform_device_add(f71882fg_pdev);
904 if(err) { 904 if (err) {
905 printk(KERN_ERR DRVNAME ": Device addition failed\n"); 905 printk(KERN_ERR DRVNAME ": Device addition failed\n");
906 goto exit_device_put; 906 goto exit_device_put;
907 } 907 }