scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()

[linux-2.6-microblaze.git] / drivers / nvmem / mxs-ocotp.c

diff --git a/drivers/nvmem/mxs-ocotp.c b/drivers/nvmem/mxs-ocotp.c
index 8e4898d..588ab56 100644 (file)
--- a/drivers/nvmem/mxs-ocotp.c
+++ b/drivers/nvmem/mxs-ocotp.c
@@ -130,6 +130,11 @@ static const struct of_device_id mxs_ocotp_match[] = {
 };
 MODULE_DEVICE_TABLE(of, mxs_ocotp_match);
 
+static void mxs_ocotp_action(void *data)
+{
+       clk_unprepare(data);
+}
+
 static int mxs_ocotp_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -160,39 +165,26 @@ static int mxs_ocotp_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = devm_add_action_or_reset(&pdev->dev, mxs_ocotp_action, otp->clk);
+       if (ret)
+               return ret;
+
        data = match->data;
 
        ocotp_config.size = data->size;
        ocotp_config.priv = otp;
        ocotp_config.dev = dev;
        otp->nvmem = devm_nvmem_register(dev, &ocotp_config);
-       if (IS_ERR(otp->nvmem)) {
-               ret = PTR_ERR(otp->nvmem);
-               goto err_clk;
-       }
+       if (IS_ERR(otp->nvmem))
+               return PTR_ERR(otp->nvmem);
 
        platform_set_drvdata(pdev, otp);
 
-       return 0;
-
-err_clk:
-       clk_unprepare(otp->clk);
-
-       return ret;
-}
-
-static int mxs_ocotp_remove(struct platform_device *pdev)
-{
-       struct mxs_ocotp *otp = platform_get_drvdata(pdev);
-
-       clk_unprepare(otp->clk);
-
        return 0;
 }
 
 static struct platform_driver mxs_ocotp_driver = {
        .probe = mxs_ocotp_probe,
-       .remove = mxs_ocotp_remove,
        .driver = {
                .name = "mxs-ocotp",
                .of_match_table = mxs_ocotp_match,