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

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
...@@ -187,7 +187,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) ...@@ -187,7 +187,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
int err = 0; int err = 0;
int i; int i;
otp = kzalloc(sizeof(struct ab3100_otp), GFP_KERNEL); otp = devm_kzalloc(&pdev->dev, sizeof(struct ab3100_otp), GFP_KERNEL);
if (!otp) { if (!otp) {
dev_err(&pdev->dev, "could not allocate AB3100 OTP device\n"); dev_err(&pdev->dev, "could not allocate AB3100 OTP device\n");
return -ENOMEM; return -ENOMEM;
...@@ -199,7 +199,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) ...@@ -199,7 +199,7 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
err = ab3100_otp_read(otp); err = ab3100_otp_read(otp);
if (err) if (err)
goto err_otp_read; return err;
dev_info(&pdev->dev, "AB3100 OTP readout registered\n"); dev_info(&pdev->dev, "AB3100 OTP readout registered\n");
...@@ -208,22 +208,19 @@ static int __init ab3100_otp_probe(struct platform_device *pdev) ...@@ -208,22 +208,19 @@ static int __init ab3100_otp_probe(struct platform_device *pdev)
err = device_create_file(&pdev->dev, err = device_create_file(&pdev->dev,
&ab3100_otp_attrs[i]); &ab3100_otp_attrs[i]);
if (err) if (err)
goto err_create_file; goto err;
} }
/* debugfs entries */ /* debugfs entries */
err = ab3100_otp_init_debugfs(&pdev->dev, otp); err = ab3100_otp_init_debugfs(&pdev->dev, otp);
if (err) if (err)
goto err_init_debugfs; goto err;
return 0; return 0;
err_init_debugfs: err:
err_create_file:
while (--i >= 0) while (--i >= 0)
device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]); device_remove_file(&pdev->dev, &ab3100_otp_attrs[i]);
err_otp_read:
kfree(otp);
return err; return err;
} }
...@@ -236,7 +233,6 @@ static int __exit ab3100_otp_remove(struct platform_device *pdev) ...@@ -236,7 +233,6 @@ static int __exit ab3100_otp_remove(struct platform_device *pdev)
device_remove_file(&pdev->dev, device_remove_file(&pdev->dev,
&ab3100_otp_attrs[i]); &ab3100_otp_attrs[i]);
ab3100_otp_exit_debugfs(otp); ab3100_otp_exit_debugfs(otp);
kfree(otp);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment