[MTD] [NAND] S3C2410: Move to using platform device table (ec0482e6) · Commits · 戴 / test

drivers/mtd/nand/s3c2410.c

+26 −52

Original line number	Diff line number	Diff line
		@@ -593,7 +593,7 @@ static inline void s3c2410_nand_cpufreq_deregister(struct s3c2410_nand_info *inf

		/* device management functions */

		static int s3c2410_nand_remove(struct platform_device *pdev)
		static int s3c24xx_nand_remove(struct platform_device *pdev)
		{
		struct s3c2410_nand_info *info = to_nand_info(pdev);

		@@ -788,18 +788,17 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
		}
		}

		/* s3c2410_nand_probe
		/* s3c24xx_nand_probe
		*
		* called by device layer when it finds a device matching
		* one our driver can handled. This code checks to see if
		* it can allocate all necessary resources then calls the
		* nand layer to look for devices
		*/

		static int s3c24xx_nand_probe(struct platform_device *pdev,
		enum s3c_cpu_type cpu_type)
		static int s3c24xx_nand_probe(struct platform_device *pdev)
		{
		struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
		enum s3c_cpu_type cpu_type;
		struct s3c2410_nand_info *info;
		struct s3c2410_nand_mtd *nmtd;
		struct s3c2410_nand_set *sets;
		@@ -809,6 +808,8 @@ static int s3c24xx_nand_probe(struct platform_device *pdev,
		int nr_sets;
		int setno;

		cpu_type = platform_get_device_id(pdev)->driver_data;

		pr_debug("s3c2410_nand_probe(%p)\n", pdev);

		info = kmalloc(sizeof(*info), GFP_KERNEL);
		@@ -922,7 +923,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev,
		return 0;

		exit_error:
		s3c2410_nand_remove(pdev);
		s3c24xx_nand_remove(pdev);

		if (err == 0)
		err = -EINVAL;
		@@ -983,50 +984,30 @@ static int s3c24xx_nand_resume(struct platform_device *dev)

		/* driver device registration */

		static int s3c2410_nand_probe(struct platform_device *dev)
		static struct platform_device_id s3c24xx_driver_ids[] = {
		{
		return s3c24xx_nand_probe(dev, TYPE_S3C2410);
		}

		static int s3c2440_nand_probe(struct platform_device *dev)
		{
		return s3c24xx_nand_probe(dev, TYPE_S3C2440);
		}

		static int s3c2412_nand_probe(struct platform_device *dev)
		{
		return s3c24xx_nand_probe(dev, TYPE_S3C2412);
		}

		static struct platform_driver s3c2410_nand_driver = {
		.probe = s3c2410_nand_probe,
		.remove = s3c2410_nand_remove,
		.suspend = s3c24xx_nand_suspend,
		.resume = s3c24xx_nand_resume,
		.driver = {
		.name = "s3c2410-nand",
		.owner = THIS_MODULE,
		},
		};

		static struct platform_driver s3c2440_nand_driver = {
		.probe = s3c2440_nand_probe,
		.remove = s3c2410_nand_remove,
		.suspend = s3c24xx_nand_suspend,
		.resume = s3c24xx_nand_resume,
		.driver = {
		.driver_data = TYPE_S3C2410,
		}, {
		.name = "s3c2440-nand",
		.owner = THIS_MODULE,
		.driver_data = TYPE_S3C2440,
		}, {
		.name = "s3c2412-nand",
		.driver_data = TYPE_S3C2412,
		},
		{ }
		};

		static struct platform_driver s3c2412_nand_driver = {
		.probe = s3c2412_nand_probe,
		.remove = s3c2410_nand_remove,
		MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids);

		static struct platform_driver s3c24xx_nand_driver = {
		.probe = s3c24xx_nand_probe,
		.remove = s3c24xx_nand_remove,
		.suspend = s3c24xx_nand_suspend,
		.resume = s3c24xx_nand_resume,
		.id_table = s3c24xx_driver_ids,
		.driver = {
		.name = "s3c2412-nand",
		.name = "s3c24xx-nand",
		.owner = THIS_MODULE,
		},
		};
		@@ -1035,16 +1016,12 @@ static int __init s3c2410_nand_init(void)
		{
		printk("S3C24XX NAND Driver, (c) 2004 Simtec Electronics\n");

		platform_driver_register(&s3c2412_nand_driver);
		platform_driver_register(&s3c2440_nand_driver);
		return platform_driver_register(&s3c2410_nand_driver);
		return platform_driver_register(&s3c24xx_nand_driver);
		}

		static void __exit s3c2410_nand_exit(void)
		{
		platform_driver_unregister(&s3c2412_nand_driver);
		platform_driver_unregister(&s3c2440_nand_driver);
		platform_driver_unregister(&s3c2410_nand_driver);
		platform_driver_unregister(&s3c24xx_nand_driver);
		}

		module_init(s3c2410_nand_init);
		@@ -1053,6 +1030,3 @@ module_exit(s3c2410_nand_exit);
		MODULE_LICENSE("GPL");
		MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
		MODULE_DESCRIPTION("S3C24XX MTD NAND driver");
		MODULE_ALIAS("platform:s3c2410-nand");
		MODULE_ALIAS("platform:s3c2412-nand");
		MODULE_ALIAS("platform:s3c2440-nand");

Admin message