{"id":979,"url":"http://patchwork.ozlabs.org/api/1.0/patches/979/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222152.m8MLqIAI031969@imap1.linux-foundation.org>","date":"2008-09-22T21:52:18","name":"[11/21] fs-enet: remove code associated with !CONFIG_PPC_MERGE","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e21fad4eb9093dd29e4a4cb8b1d26f09b87c1cb0","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222152.m8MLqIAI031969@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/979/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 8D43BDDE1C\n\tfor ;\n\tTue, 23 Sep 2008 07:59:18 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754227AbYIVV7L (ORCPT );\n\tMon, 22 Sep 2008 17:59:11 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1754208AbYIVV7L\n\t(ORCPT ); Mon, 22 Sep 2008 17:59:11 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:38798 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1754134AbYIVV7J (ORCPT\n\t); Mon, 22 Sep 2008 17:59:09 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLrDON018507\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:57:40 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLqIAI031969; Mon, 22 Sep 2008 14:52:18 -0700"],"Message-Id":"<200809222152.m8MLqIAI031969@imap1.linux-foundation.org>","Subject":"[patch 11/21] fs-enet: remove code associated with !CONFIG_PPC_MERGE","To":"jeff@garzik.org","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tgalak@kernel.crashing.org, benh@kernel.crashing.org,\n\tpaulus@samba.org, scottwood@freescale.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:52:18 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Kumar Gala \n\nNow that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove\nthe dead code associated with !CONFIG_PPC_MERGE.\n\nWith this change the pre_request_irq() and post_free_irq() calls became\nnops so they have been removed. Also removed fs_request_irq() and\nfs_free_irq() and just called request_irq() and free_irq().\n\nSigned-off-by: Kumar Gala \nCc: Benjamin Herrenschmidt \nCc: Paul Mackerras \nCc: Jeff Garzik \nCc: Scott Wood \nSigned-off-by: Andrew Morton \n---\n\n drivers/net/fs_enet/fs_enet-main.c | 22 ++-----------------\n drivers/net/fs_enet/fs_enet.h | 2 -\n drivers/net/fs_enet/mac-fcc.c | 12 ----------\n drivers/net/fs_enet/mac-fec.c | 30 ---------------------------\n drivers/net/fs_enet/mac-scc.c | 26 -----------------------\n 5 files changed, 3 insertions(+), 89 deletions(-)","diff":"diff -puN drivers/net/fs_enet/fs_enet-main.c~fs-enet-remove-code-associated-with-config_ppc_merge drivers/net/fs_enet/fs_enet-main.c\n--- a/drivers/net/fs_enet/fs_enet-main.c~fs-enet-remove-code-associated-with-config_ppc_merge\n+++ a/drivers/net/fs_enet/fs_enet-main.c\n@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_\n \treturn NETDEV_TX_OK;\n }\n \n-static int fs_request_irq(struct net_device *dev, int irq, const char *name,\n-\t\tirq_handler_t irqf)\n-{\n-\tstruct fs_enet_private *fep = netdev_priv(dev);\n-\n-\t(*fep->ops->pre_request_irq)(dev, irq);\n-\treturn request_irq(irq, irqf, IRQF_SHARED, name, dev);\n-}\n-\n-static void fs_free_irq(struct net_device *dev, int irq)\n-{\n-\tstruct fs_enet_private *fep = netdev_priv(dev);\n-\n-\tfree_irq(irq, dev);\n-\t(*fep->ops->post_free_irq)(dev, irq);\n-}\n-\n static void fs_timeout(struct net_device *dev)\n {\n \tstruct fs_enet_private *fep = netdev_priv(dev);\n@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_devic\n \t\tnapi_enable(&fep->napi);\n \n \t/* Install our interrupt handler. */\n-\tr = fs_request_irq(dev, fep->interrupt, \"fs_enet-mac\", fs_enet_interrupt);\n+\tr = request_irq(fep->interrupt, fs_enet_interrupt, IRQF_SHARED,\n+\t\t\t\"fs_enet-mac\", dev);\n \tif (r != 0) {\n \t\tprintk(KERN_ERR DRV_MODULE_NAME\n \t\t \": %s Could not allocate FS_ENET IRQ!\", dev->name);\n@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_devi\n \t/* release any irqs */\n \tphy_disconnect(fep->phydev);\n \tfep->phydev = NULL;\n-\tfs_free_irq(dev, fep->interrupt);\n+\tfree_irq(fep->interrupt, dev);\n \n \treturn 0;\n }\ndiff -puN drivers/net/fs_enet/fs_enet.h~fs-enet-remove-code-associated-with-config_ppc_merge drivers/net/fs_enet/fs_enet.h\n--- a/drivers/net/fs_enet/fs_enet.h~fs-enet-remove-code-associated-with-config_ppc_merge\n+++ a/drivers/net/fs_enet/fs_enet.h\n@@ -34,8 +34,6 @@ struct fs_ops {\n \tvoid (*adjust_link)(struct net_device *dev);\n \tvoid (*restart)(struct net_device *dev);\n \tvoid (*stop)(struct net_device *dev);\n-\tvoid (*pre_request_irq)(struct net_device *dev, int irq);\n-\tvoid (*post_free_irq)(struct net_device *dev, int irq);\n \tvoid (*napi_clear_rx_event)(struct net_device *dev);\n \tvoid (*napi_enable_rx)(struct net_device *dev);\n \tvoid (*napi_disable_rx)(struct net_device *dev);\ndiff -puN drivers/net/fs_enet/mac-fcc.c~fs-enet-remove-code-associated-with-config_ppc_merge drivers/net/fs_enet/mac-fcc.c\n--- a/drivers/net/fs_enet/mac-fcc.c~fs-enet-remove-code-associated-with-config_ppc_merge\n+++ a/drivers/net/fs_enet/mac-fcc.c\n@@ -421,16 +421,6 @@ static void stop(struct net_device *dev)\n \tfs_cleanup_bds(dev);\n }\n \n-static void pre_request_irq(struct net_device *dev, int irq)\n-{\n-\t/* nothing */\n-}\n-\n-static void post_free_irq(struct net_device *dev, int irq)\n-{\n-\t/* nothing */\n-}\n-\n static void napi_clear_rx_event(struct net_device *dev)\n {\n \tstruct fs_enet_private *fep = netdev_priv(dev);\n@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_ops = {\n \t.set_multicast_list\t= set_multicast_list,\n \t.restart\t\t= restart,\n \t.stop\t\t\t= stop,\n-\t.pre_request_irq\t= pre_request_irq,\n-\t.post_free_irq\t\t= post_free_irq,\n \t.napi_clear_rx_event\t= napi_clear_rx_event,\n \t.napi_enable_rx\t\t= napi_enable_rx,\n \t.napi_disable_rx\t= napi_disable_rx,\ndiff -puN drivers/net/fs_enet/mac-fec.c~fs-enet-remove-code-associated-with-config_ppc_merge drivers/net/fs_enet/mac-fec.c\n--- a/drivers/net/fs_enet/mac-fec.c~fs-enet-remove-code-associated-with-config_ppc_merge\n+++ a/drivers/net/fs_enet/mac-fec.c\n@@ -313,11 +313,7 @@ static void restart(struct net_device *d\n \t * Clear any outstanding interrupt.\n \t */\n \tFW(fecp, ievent, 0xffc0);\n-#ifndef CONFIG_PPC_MERGE\n-\tFW(fecp, ivec, (fep->interrupt / 2) << 29);\n-#else\n \tFW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29);\n-#endif\n \n \t/*\n \t * adjust to speed (only for DUET & RMII)\n@@ -413,30 +409,6 @@ static void stop(struct net_device *dev)\n \t}\n }\n \n-static void pre_request_irq(struct net_device *dev, int irq)\n-{\n-#ifndef CONFIG_PPC_MERGE\n-\timmap_t *immap = fs_enet_immap;\n-\tu32 siel;\n-\n-\t/* SIU interrupt */\n-\tif (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) {\n-\n-\t\tsiel = in_be32(&immap->im_siu_conf.sc_siel);\n-\t\tif ((irq & 1) == 0)\n-\t\t\tsiel |= (0x80000000 >> irq);\n-\t\telse\n-\t\t\tsiel &= ~(0x80000000 >> (irq & ~1));\n-\t\tout_be32(&immap->im_siu_conf.sc_siel, siel);\n-\t}\n-#endif\n-}\n-\n-static void post_free_irq(struct net_device *dev, int irq)\n-{\n-\t/* nothing */\n-}\n-\n static void napi_clear_rx_event(struct net_device *dev)\n {\n \tstruct fs_enet_private *fep = netdev_priv(dev);\n@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_ops = {\n \t.set_multicast_list\t= set_multicast_list,\n \t.restart\t\t= restart,\n \t.stop\t\t\t= stop,\n-\t.pre_request_irq\t= pre_request_irq,\n-\t.post_free_irq\t\t= post_free_irq,\n \t.napi_clear_rx_event\t= napi_clear_rx_event,\n \t.napi_enable_rx\t\t= napi_enable_rx,\n \t.napi_disable_rx\t= napi_disable_rx,\ndiff -puN drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_merge drivers/net/fs_enet/mac-scc.c\n--- a/drivers/net/fs_enet/mac-scc.c~fs-enet-remove-code-associated-with-config_ppc_merge\n+++ a/drivers/net/fs_enet/mac-scc.c\n@@ -377,30 +377,6 @@ static void stop(struct net_device *dev)\n \tfs_cleanup_bds(dev);\n }\n \n-static void pre_request_irq(struct net_device *dev, int irq)\n-{\n-#ifndef CONFIG_PPC_MERGE\n-\timmap_t *immap = fs_enet_immap;\n-\tu32 siel;\n-\n-\t/* SIU interrupt */\n-\tif (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) {\n-\n-\t\tsiel = in_be32(&immap->im_siu_conf.sc_siel);\n-\t\tif ((irq & 1) == 0)\n-\t\t\tsiel |= (0x80000000 >> irq);\n-\t\telse\n-\t\t\tsiel &= ~(0x80000000 >> (irq & ~1));\n-\t\tout_be32(&immap->im_siu_conf.sc_siel, siel);\n-\t}\n-#endif\n-}\n-\n-static void post_free_irq(struct net_device *dev, int irq)\n-{\n-\t/* nothing */\n-}\n-\n static void napi_clear_rx_event(struct net_device *dev)\n {\n \tstruct fs_enet_private *fep = netdev_priv(dev);\n@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = {\n \t.set_multicast_list\t= set_multicast_list,\n \t.restart\t\t= restart,\n \t.stop\t\t\t= stop,\n-\t.pre_request_irq\t= pre_request_irq,\n-\t.post_free_irq\t\t= post_free_irq,\n \t.napi_clear_rx_event\t= napi_clear_rx_event,\n \t.napi_enable_rx\t\t= napi_enable_rx,\n \t.napi_disable_rx\t= napi_disable_rx,\n","prefixes":["11/21"]}