Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757325AbYHAQqr (ORCPT ); Fri, 1 Aug 2008 12:46:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754010AbYHAQog (ORCPT ); Fri, 1 Aug 2008 12:44:36 -0400 Received: from gate.crashing.org ([63.228.1.57]:50640 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446AbYHAQof (ORCPT ); Fri, 1 Aug 2008 12:44:35 -0400 From: Kumar Gala To: linuxppc-dev@ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 07/10] mpc52xx_psc_spi: remove code associated with !CONFIG_PPC_MERGE Date: Fri, 1 Aug 2008 11:44:17 -0500 Message-Id: <1217609060-6381-8-git-send-email-galak@kernel.crashing.org> X-Mailer: git-send-email 1.5.5.1 In-Reply-To: <1217609060-6381-7-git-send-email-galak@kernel.crashing.org> References: <1217609060-6381-1-git-send-email-galak@kernel.crashing.org> <1217609060-6381-2-git-send-email-galak@kernel.crashing.org> <1217609060-6381-3-git-send-email-galak@kernel.crashing.org> <1217609060-6381-4-git-send-email-galak@kernel.crashing.org> <1217609060-6381-5-git-send-email-galak@kernel.crashing.org> <1217609060-6381-6-git-send-email-galak@kernel.crashing.org> <1217609060-6381-7-git-send-email-galak@kernel.crashing.org> CC: dbrownell@users.sourceforge.net CC: spi-devel-general@lists.sourceforge.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2642 Lines: 97 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 --- 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 #include #include - -#if defined(CONFIG_PPC_MERGE) #include -#else -#include -#endif - #include #include #include @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/