From patchwork Mon Sep 7 09:59:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Pettersson X-Patchwork-Id: 33078 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 30769B7B76 for ; Mon, 7 Sep 2009 20:28:37 +1000 (EST) Received: by ozlabs.org (Postfix) id 210FFDDD0B; Mon, 7 Sep 2009 20:28:37 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 92E71DDD04 for ; Mon, 7 Sep 2009 20:28:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752907AbZIGK1Z (ORCPT ); Mon, 7 Sep 2009 06:27:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752894AbZIGK1Z (ORCPT ); Mon, 7 Sep 2009 06:27:25 -0400 Received: from fanny.its.uu.se ([130.238.4.241]:53650 "EHLO fanny.its.uu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752771AbZIGK1X (ORCPT ); Mon, 7 Sep 2009 06:27:23 -0400 X-Greylist: delayed 1684 seconds by postgrey-1.27 at vger.kernel.org; Mon, 07 Sep 2009 06:27:23 EDT Received: by fanny.its.uu.se (Postfix, from userid 212) id D51CA62C7; Mon, 7 Sep 2009 11:59:20 +0200 (MSZ) X-Spam-Checker-Version: SpamAssassin 3.1.9 (2007-02-13) on spamass.its.uu.se X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.1.9 Received: from pilspetsen.it.uu.se (pilspetsen.it.uu.se [130.238.18.39]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by fanny.its.uu.se (Postfix) with ESMTP id 81D4A61E1; Mon, 7 Sep 2009 11:59:17 +0200 (MSZ) Received: (from mikpe@localhost) by pilspetsen.it.uu.se (8.13.8+Sun/8.13.8) id n879xGui019854; Mon, 7 Sep 2009 11:59:16 +0200 (MEST) Date: Mon, 7 Sep 2009 11:59:16 +0200 (MEST) Message-Id: <200909070959.n879xGui019854@pilspetsen.it.uu.se> From: Mikael Pettersson To: Lennert Buytenhek Subject: [PATCH 2.6.31-rc9] mv643xx_eth.c: remove unused txq_set_wrr() Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The txq_set_wrr() function in drivers/net/mv643xx_eth.c is unused, not even referenced under #if 0 or something like that, which results in a compile-time warning: drivers/net/mv643xx_eth.c:1070: warning: 'txq_set_wrr' defined but not used Fix: remove it. Signed-off-by: Mikael Pettersson --- drivers/net/mv643xx_eth.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.31-rc9/drivers/net/mv643xx_eth.c.~1~ 2009-09-06 12:20:57.000000000 +0200 +++ linux-2.6.31-rc9/drivers/net/mv643xx_eth.c 2009-09-07 11:36:32.000000000 +0200 @@ -1066,40 +1066,6 @@ static void txq_set_fixed_prio_mode(stru } } -static void txq_set_wrr(struct tx_queue *txq, int weight) -{ - struct mv643xx_eth_private *mp = txq_to_mp(txq); - int off; - u32 val; - - /* - * Turn off fixed priority mode. - */ - off = 0; - switch (mp->shared->tx_bw_control) { - case TX_BW_CONTROL_OLD_LAYOUT: - off = TXQ_FIX_PRIO_CONF; - break; - case TX_BW_CONTROL_NEW_LAYOUT: - off = TXQ_FIX_PRIO_CONF_MOVED; - break; - } - - if (off) { - val = rdlp(mp, off); - val &= ~(1 << txq->index); - wrlp(mp, off, val); - - /* - * Configure WRR weight for this queue. - */ - - val = rdlp(mp, off); - val = (val & ~0xff) | (weight & 0xff); - wrlp(mp, TXQ_BW_WRR_CONF(txq->index), val); - } -} - /* mii management interface *************************************************/ static irqreturn_t mv643xx_eth_err_irq(int irq, void *dev_id)