Commit 5feac05d authored by Lee Jones's avatar Lee Jones Committed by Samuel Ortiz
Browse files

mfd: ab3100-otp: Convert to managed resources for allocating memory 



Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b3fff177

drivers/mfd/ab3100-otp.c

+5 −9
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) 
	int err = 0;

	int i;



	otp = kzalloc(sizeof(struct ab3100_otp), GFP_KERNEL);

	otp = devm_kzalloc(&pdev->dev, sizeof(struct ab3100_otp), GFP_KERNEL);

	if (!otp) {

		dev_err(&pdev->dev, "could not allocate AB3100 OTP device\n");

		return -ENOMEM;
@@ -199,7 +199,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) 


	err = ab3100_otp_read(otp);

	if (err)

		goto err_otp_read;

		return err;



	dev_info(&pdev->dev, "AB3100 OTP readout registered\n");
@@ -208,22 +208,19 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) 
		err = device_create_file(&pdev->dev,

					 &ab3100_otp_attrs[i]);

		if (err)

			goto err_create_file;

			goto err;

	}



	/* debugfs entries */

	err = ab3100_otp_init_debugfs(&pdev->dev, otp);

	if (err)

		goto err_init_debugfs;

		goto err;



	return 0;



err_init_debugfs:

err_create_file:

err:

	while (--i >= 0)

		device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]);

err_otp_read:

	kfree(otp);

	return err;

}
@@ -236,7 +233,6 @@ static int __exit ab3100_otp_remove(struct platform_device *pdev) 
		device_remove_file(&pdev->dev,

				   &ab3100_otp_attrs[i]);

	ab3100_otp_exit_debugfs(otp);

	kfree(otp);

	return 0;

}