nvmem: lpc18xx_eeprom: use devm_nvmem_register()

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

diff --git a/drivers/nvmem/lpc18xx_eeprom.c b/drivers/nvmem/lpc18xx_eeprom.c
index a9534a6..b42dbad 100644 (file)
--- a/drivers/nvmem/lpc18xx_eeprom.c
+++ b/drivers/nvmem/lpc18xx_eeprom.c
@@ -236,7 +236,7 @@ static int lpc18xx_eeprom_probe(struct platform_device *pdev)
        lpc18xx_nvmem_config.dev = dev;
        lpc18xx_nvmem_config.priv = eeprom;
 
-       eeprom->nvmem = nvmem_register(&lpc18xx_nvmem_config);
+       eeprom->nvmem = devm_nvmem_register(dev, &lpc18xx_nvmem_config);
        if (IS_ERR(eeprom->nvmem)) {
                ret = PTR_ERR(eeprom->nvmem);
                goto err_clk;
@@ -257,10 +257,6 @@ static int lpc18xx_eeprom_remove(struct platform_device *pdev)
        struct lpc18xx_eeprom_dev *eeprom = platform_get_drvdata(pdev);
        int ret;
 
-       ret = nvmem_unregister(eeprom->nvmem);
-       if (ret < 0)
-               return ret;
-
        clk_disable_unprepare(eeprom->clk);
 
        return 0;