diff options
Diffstat (limited to 'drivers/mtd/nand/raw/omap2.c')
| -rw-r--r-- | drivers/mtd/nand/raw/omap2.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c index 4a9f2b6c772d..db22b3af16d8 100644 --- a/drivers/mtd/nand/raw/omap2.c +++ b/drivers/mtd/nand/raw/omap2.c @@ -2273,7 +2273,7 @@ return_error:  	return err;  } -static int omap_nand_remove(struct platform_device *pdev) +static void omap_nand_remove(struct platform_device *pdev)  {  	struct mtd_info *mtd = platform_get_drvdata(pdev);  	struct nand_chip *nand_chip = mtd_to_nand(mtd); @@ -2285,7 +2285,6 @@ static int omap_nand_remove(struct platform_device *pdev)  		dma_release_channel(info->dma);  	WARN_ON(mtd_device_unregister(mtd));  	nand_cleanup(nand_chip); -	return 0;  }  /* omap_nand_ids defined in linux/platform_data/mtd-nand-omap2.h */ @@ -2293,7 +2292,7 @@ MODULE_DEVICE_TABLE(of, omap_nand_ids);  static struct platform_driver omap_nand_driver = {  	.probe		= omap_nand_probe, -	.remove		= omap_nand_remove, +	.remove_new	= omap_nand_remove,  	.driver		= {  		.name	= DRIVER_NAME,  		.of_match_table = omap_nand_ids,  |