* [PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE [not found] ` <1219294018-12557-6-git-send-email-galak@kernel.crashing.org> @ 2008-08-21 4:46 ` Kumar Gala [not found] ` <1219294018-12557-7-git-send-email-galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Kumar Gala @ 2008-08-21 4:46 UTC (permalink / raw) To: linux-kernel; +Cc: akpm, dbrownell, spi-devel-general 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> --- drivers/spi/mpc52xx_psc_spi.c | 55 ----------------------------------------- 1 files changed, 0 insertions(+), 55 deletions(-) diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index 25eda71..c3a9e5c 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c @@ -15,13 +15,7 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/interrupt.h> - -#if defined(CONFIG_PPC_MERGE) #include <linux/of_platform.h> -#else -#include <linux/platform_device.h> -#endif - #include <linux/workqueue.h> #include <linux/completion.h> #include <linux/io.h> @@ -471,53 +465,6 @@ static int __exit mpc52xx_psc_spi_do_remove(struct device *dev) 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, const struct of_device_id *match) { @@ -586,8 +533,6 @@ static void __exit mpc52xx_psc_spi_exit(void) } module_exit(mpc52xx_psc_spi_exit); -#endif /* defined(CONFIG_PPC_MERGE) */ - MODULE_AUTHOR("Dragos Carp"); MODULE_DESCRIPTION("MPC52xx PSC SPI Driver"); MODULE_LICENSE("GPL"); -- 1.5.5.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <1219294018-12557-7-git-send-email-galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>]
* Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE [not found] ` <1219294018-12557-7-git-send-email-galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> @ 2008-10-15 21:23 ` Kumar Gala 2008-10-15 21:34 ` David Brownell 0 siblings, 1 reply; 3+ messages in thread From: Kumar Gala @ 2008-10-15 21:23 UTC (permalink / raw) To: Kumar Gala Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b, dbrownell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f, linux-kernel-u79uwXL29TY76Z2rM5mHXA On Aug 20, 2008, at 11:46 PM, Kumar Gala wrote: > 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-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> > --- > drivers/spi/mpc52xx_psc_spi.c | 55 > ----------------------------------------- > 1 files changed, 0 insertions(+), 55 deletions(-) Any update on acceptance of this patch? - k ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE 2008-10-15 21:23 ` Kumar Gala @ 2008-10-15 21:34 ` David Brownell 0 siblings, 0 replies; 3+ messages in thread From: David Brownell @ 2008-10-15 21:34 UTC (permalink / raw) To: Kumar Gala; +Cc: linux-kernel, spi-devel-general, akpm On Wednesday 15 October 2008, Kumar Gala wrote: > > On Aug 20, 2008, at 11:46 PM, Kumar Gala wrote: > > > 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> > > --- > > drivers/spi/mpc52xx_psc_spi.c | 55 > > ----------------------------------------- > > 1 files changed, 0 insertions(+), 55 deletions(-) > > Any update on acceptance of this patch? Still seems to be in the MM queue ready to merge a bit later in the window. - Dave ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-10-15 21:34 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <1219294018-12557-1-git-send-email-galak@kernel.crashing.org> [not found] ` <1219294018-12557-2-git-send-email-galak@kernel.crashing.org> [not found] ` <1219294018-12557-3-git-send-email-galak@kernel.crashing.org> [not found] ` <1219294018-12557-4-git-send-email-galak@kernel.crashing.org> [not found] ` <1219294018-12557-5-git-send-email-galak@kernel.crashing.org> [not found] ` <1219294018-12557-6-git-send-email-galak@kernel.crashing.org> 2008-08-21 4:46 ` [PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE Kumar Gala [not found] ` <1219294018-12557-7-git-send-email-galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2008-10-15 21:23 ` Kumar Gala 2008-10-15 21:34 ` David Brownell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).