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

hwmon: (nct6775) Convert to use devm_hwmon_device_register_with_groups

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

+5 -16
+5 -16
drivers/hwmon/nct6775.c
··· 724 724 enum kinds kind; 725 725 const char *name; 726 726 727 - struct device *hwmon_dev; 728 - 729 727 int num_attr_groups; 730 728 const struct attribute_group *groups[6]; 731 729 ··· 3258 3260 int num_reg_temp; 3259 3261 u8 cr2a; 3260 3262 struct attribute_group *group; 3263 + struct device *hwmon_dev; 3261 3264 3262 3265 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 3263 3266 if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH, ··· 3860 3861 data->groups[data->num_attr_groups++] = group; 3861 3862 data->groups[data->num_attr_groups++] = &nct6775_group_other; 3862 3863 3863 - data->hwmon_dev = hwmon_device_register_with_groups(dev, data->name, 3864 - data, data->groups); 3865 - if (IS_ERR(data->hwmon_dev)) 3866 - return PTR_ERR(data->hwmon_dev); 3867 - 3868 - return 0; 3869 - } 3870 - 3871 - static int nct6775_remove(struct platform_device *pdev) 3872 - { 3873 - struct nct6775_data *data = platform_get_drvdata(pdev); 3874 - 3875 - hwmon_device_unregister(data->hwmon_dev); 3864 + hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name, 3865 + data, data->groups); 3866 + if (IS_ERR(hwmon_dev)) 3867 + return PTR_ERR(hwmon_dev); 3876 3868 3877 3869 return 0; 3878 3870 } ··· 3954 3964 .pm = NCT6775_DEV_PM_OPS, 3955 3965 }, 3956 3966 .probe = nct6775_probe, 3957 - .remove = nct6775_remove, 3958 3967 }; 3959 3968 3960 3969 static const char * const nct6775_sio_names[] __initconst = {