Commit adc14132 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (f71805f) Convert to use devm_ functions 



Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent 7b7bb90c

drivers/hwmon/f71805f.c

+7 −19
Original line number Original line Diff line number Diff line
@@ -1386,20 +1386,20 @@ static int __devinit f71805f_probe(struct platform_device *pdev) 
		"f71872f",

		"f71872f",

	};

	};





	data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(struct f71805f_data),

			    GFP_KERNEL);

	if (!data) {

	if (!data) {

		err = -ENOMEM;

		pr_err("Out of memory\n");

		pr_err("Out of memory\n");

		goto exit;

		return -ENOMEM;

	}

	}





	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	if (!request_region(res->start + ADDR_REG_OFFSET, 2, DRVNAME)) {

	if (!devm_request_region(&pdev->dev, res->start + ADDR_REG_OFFSET, 2,

		err = -EBUSY;

				 DRVNAME)) {

		dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",

		dev_err(&pdev->dev, "Failed to request region 0x%lx-0x%lx\n",

			(unsigned long)(res->start + ADDR_REG_OFFSET),

			(unsigned long)(res->start + ADDR_REG_OFFSET),

			(unsigned long)(res->start + ADDR_REG_OFFSET + 1));

			(unsigned long)(res->start + ADDR_REG_OFFSET + 1));

		goto exit_free;

		return -EBUSY;

	}

	}

	data->addr = res->start;

	data->addr = res->start;

	data->name = names[sio_data->kind];

	data->name = names[sio_data->kind];
@@ -1427,7 +1427,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev) 
	/* Register sysfs interface files */

	/* Register sysfs interface files */

	err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group);

	err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group);

	if (err)

	if (err)

		goto exit_release_region;

		return err;

	if (data->has_in & (1 << 4)) { /* in4 */

	if (data->has_in & (1 << 4)) { /* in4 */

		err = sysfs_create_group(&pdev->dev.kobj,

		err = sysfs_create_group(&pdev->dev.kobj,

					 &f71805f_group_optin[0]);

					 &f71805f_group_optin[0]);
@@ -1487,19 +1487,12 @@ static int __devinit f71805f_probe(struct platform_device *pdev) 
	for (i = 0; i < 4; i++)

	for (i = 0; i < 4; i++)

		sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);

		sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);

	sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);

	sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);

exit_release_region:

	release_region(res->start + ADDR_REG_OFFSET, 2);

exit_free:

	platform_set_drvdata(pdev, NULL);

	kfree(data);

exit:

	return err;

	return err;

}

}





static int __devexit f71805f_remove(struct platform_device *pdev)

static int __devexit f71805f_remove(struct platform_device *pdev)

{

{

	struct f71805f_data *data = platform_get_drvdata(pdev);

	struct f71805f_data *data = platform_get_drvdata(pdev);

	struct resource *res;

	int i;

	int i;





	hwmon_device_unregister(data->hwmon_dev);

	hwmon_device_unregister(data->hwmon_dev);
@@ -1507,11 +1500,6 @@ static int __devexit f71805f_remove(struct platform_device *pdev) 
	for (i = 0; i < 4; i++)

	for (i = 0; i < 4; i++)

		sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);

		sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);

	sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);

	sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);

	platform_set_drvdata(pdev, NULL);

	kfree(data);



	res = platform_get_resource(pdev, IORESOURCE_IO, 0);

	release_region(res->start + ADDR_REG_OFFSET, 2);





	return 0;

	return 0;

}

}