mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE
Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove the dead code associated with !CONFIG_PPC_MERGE. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: David Brownell <david-b@pacbell.net> Cc: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
bf2a9a3963
commit
62f9e8f15a
@ -15,13 +15,7 @@
|
|||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
|
||||||
#if defined(CONFIG_PPC_MERGE)
|
|
||||||
#include <linux/of_platform.h>
|
#include <linux/of_platform.h>
|
||||||
#else
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
#include <linux/completion.h>
|
#include <linux/completion.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
@ -471,53 +465,6 @@ static int __exit mpc52xx_psc_spi_do_remove(struct device *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(CONFIG_PPC_MERGE)
|
|
||||||
static int __init mpc52xx_psc_spi_probe(struct platform_device *dev)
|
|
||||||
{
|
|
||||||
switch(dev->id) {
|
|
||||||
case 1:
|
|
||||||
case 2:
|
|
||||||
case 3:
|
|
||||||
case 6:
|
|
||||||
return mpc52xx_psc_spi_do_probe(&dev->dev,
|
|
||||||
MPC52xx_PA(MPC52xx_PSCx_OFFSET(dev->id)),
|
|
||||||
MPC52xx_PSC_SIZE, platform_get_irq(dev, 0), dev->id);
|
|
||||||
default:
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev)
|
|
||||||
{
|
|
||||||
return mpc52xx_psc_spi_do_remove(&dev->dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* work with hotplug and coldplug */
|
|
||||||
MODULE_ALIAS("platform:mpc52xx-psc-spi");
|
|
||||||
|
|
||||||
static struct platform_driver mpc52xx_psc_spi_platform_driver = {
|
|
||||||
.remove = __exit_p(mpc52xx_psc_spi_remove),
|
|
||||||
.driver = {
|
|
||||||
.name = "mpc52xx-psc-spi",
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init mpc52xx_psc_spi_init(void)
|
|
||||||
{
|
|
||||||
return platform_driver_probe(&mpc52xx_psc_spi_platform_driver,
|
|
||||||
mpc52xx_psc_spi_probe);
|
|
||||||
}
|
|
||||||
module_init(mpc52xx_psc_spi_init);
|
|
||||||
|
|
||||||
static void __exit mpc52xx_psc_spi_exit(void)
|
|
||||||
{
|
|
||||||
platform_driver_unregister(&mpc52xx_psc_spi_platform_driver);
|
|
||||||
}
|
|
||||||
module_exit(mpc52xx_psc_spi_exit);
|
|
||||||
|
|
||||||
#else /* defined(CONFIG_PPC_MERGE) */
|
|
||||||
|
|
||||||
static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
|
static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
|
||||||
const struct of_device_id *match)
|
const struct of_device_id *match)
|
||||||
{
|
{
|
||||||
@ -586,8 +533,6 @@ static void __exit mpc52xx_psc_spi_exit(void)
|
|||||||
}
|
}
|
||||||
module_exit(mpc52xx_psc_spi_exit);
|
module_exit(mpc52xx_psc_spi_exit);
|
||||||
|
|
||||||
#endif /* defined(CONFIG_PPC_MERGE) */
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Dragos Carp");
|
MODULE_AUTHOR("Dragos Carp");
|
||||||
MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");
|
MODULE_DESCRIPTION("MPC52xx PSC SPI Driver");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
Loading…
Reference in New Issue
Block a user