aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/gpmi-nand
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-09-05 10:35:24 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-09-29 10:43:01 -0400
commit490e280a69cb0707ccb4c7e0c5c0be02d8ae102c (patch)
treea6d8889ab0c160c5f96e2117793f278cd7463f81 /drivers/mtd/nand/gpmi-nand
parent3d10095a941a29253102625d8710fe31a1a24b56 (diff)
mtd: gpmi-nand: Convert to module_platform_driver()
Using module_platform_driver() makes the code smaller and cleaner. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand')
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-nand.c29
1 files changed, 7 insertions, 22 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 94935079a328..5999b15f3e87 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1651,6 +1651,8 @@ static int __devinit gpmi_nand_probe(struct platform_device *pdev)
1651 if (ret) 1651 if (ret)
1652 goto exit_nfc_init; 1652 goto exit_nfc_init;
1653 1653
1654 dev_info(this->dev, "driver registered.\n");
1655
1654 return 0; 1656 return 0;
1655 1657
1656exit_nfc_init: 1658exit_nfc_init:
@@ -1658,10 +1660,12 @@ exit_nfc_init:
1658exit_acquire_resources: 1660exit_acquire_resources:
1659 platform_set_drvdata(pdev, NULL); 1661 platform_set_drvdata(pdev, NULL);
1660 kfree(this); 1662 kfree(this);
1663 dev_err(this->dev, "driver registration failed: %d\n", ret);
1664
1661 return ret; 1665 return ret;
1662} 1666}
1663 1667
1664static int __exit gpmi_nand_remove(struct platform_device *pdev) 1668static int __devexit gpmi_nand_remove(struct platform_device *pdev)
1665{ 1669{
1666 struct gpmi_nand_data *this = platform_get_drvdata(pdev); 1670 struct gpmi_nand_data *this = platform_get_drvdata(pdev);
1667 1671
@@ -1678,29 +1682,10 @@ static struct platform_driver gpmi_nand_driver = {
1678 .of_match_table = gpmi_nand_id_table, 1682 .of_match_table = gpmi_nand_id_table,
1679 }, 1683 },
1680 .probe = gpmi_nand_probe, 1684 .probe = gpmi_nand_probe,
1681 .remove = __exit_p(gpmi_nand_remove), 1685 .remove = __devexit_p(gpmi_nand_remove),
1682 .id_table = gpmi_ids, 1686 .id_table = gpmi_ids,
1683}; 1687};
1684 1688module_platform_driver(gpmi_nand_driver);
1685static int __init gpmi_nand_init(void)
1686{
1687 int err;
1688
1689 err = platform_driver_register(&gpmi_nand_driver);
1690 if (err == 0)
1691 pr_info("driver registered.\n");
1692 else
1693 pr_err("driver registration failed.\n");
1694 return err;
1695}
1696
1697static void __exit gpmi_nand_exit(void)
1698{
1699 platform_driver_unregister(&gpmi_nand_driver);
1700}
1701
1702module_init(gpmi_nand_init);
1703module_exit(gpmi_nand_exit);
1704 1689
1705MODULE_AUTHOR("Freescale Semiconductor, Inc."); 1690MODULE_AUTHOR("Freescale Semiconductor, Inc.");
1706MODULE_DESCRIPTION("i.MX GPMI NAND Flash Controller Driver"); 1691MODULE_DESCRIPTION("i.MX GPMI NAND Flash Controller Driver");