return err;
 }
 
-static int n2_crypto_remove(struct platform_device *dev)
+static void n2_crypto_remove(struct platform_device *dev)
 {
        struct n2_crypto *np = dev_get_drvdata(&dev->dev);
 
        release_global_resources();
 
        free_n2cp(np);
-
-       return 0;
 }
 
 static struct n2_mau *alloc_ncp(void)
        return err;
 }
 
-static int n2_mau_remove(struct platform_device *dev)
+static void n2_mau_remove(struct platform_device *dev)
 {
        struct n2_mau *mp = dev_get_drvdata(&dev->dev);
 
        release_global_resources();
 
        free_ncp(mp);
-
-       return 0;
 }
 
 static const struct of_device_id n2_crypto_match[] = {
                .of_match_table =       n2_crypto_match,
        },
        .probe          =       n2_crypto_probe,
-       .remove         =       n2_crypto_remove,
+       .remove_new     =       n2_crypto_remove,
 };
 
 static const struct of_device_id n2_mau_match[] = {
                .of_match_table =       n2_mau_match,
        },
        .probe          =       n2_mau_probe,
-       .remove         =       n2_mau_remove,
+       .remove_new     =       n2_mau_remove,
 };
 
 static struct platform_driver * const drivers[] = {