From patchwork Mon Dec 7 12:17:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 40473 X-Patchwork-Delegate: davem@davemloft.net 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]) by ozlabs.org (Postfix) with ESMTP id 98FE9B6F12 for ; Mon, 7 Dec 2009 23:20:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757508AbZLGMTB (ORCPT ); Mon, 7 Dec 2009 07:19:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756434AbZLGMTA (ORCPT ); Mon, 7 Dec 2009 07:19:00 -0500 Received: from aeryn.fluff.org.uk ([87.194.8.8]:48544 "EHLO kira.home.fluff.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755816AbZLGMSW (ORCPT ); Mon, 7 Dec 2009 07:18:22 -0500 Received: from ben by kira.home.fluff.org with local (Exim 4.69) (envelope-from ) id 1NHcXs-0004ag-Mf; Mon, 07 Dec 2009 12:18:28 +0000 Message-Id: <20091207121828.593562553@fluff.org.uk> User-Agent: quilt/0.48-1 Date: Mon, 07 Dec 2009 12:17:35 +0000 From: Ben Dooks To: netdev@vger.kernel.org Cc: linux@simtec.co.uk, doong.ping@micrel.com, tristram.ha@micrel.com Subject: [patch 8/9] KS8851: Use the ks8851.h header to hold union ks8851_tx_hdr References: <20091207121727.016092171@fluff.org.uk> Content-Disposition: inline; filename=ks8851-reduce-header-duplication3.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The union ks8851_tx_hdr turns up in both ks8851.c and ks8851_mll.c in two --- 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 different formats, thus making a common version in ks8851.h is going to save source file usage. The ks8851_mll.c uses the name ks_tx_hdr instead of ks8851_tx_hdr, so rename this instance. Signed-off-by: Ben Dooks --- Index: b/drivers/net/ks8851.c =================================================================== --- a/drivers/net/ks8851.c 2009-12-07 11:24:54.000000000 +0000 +++ b/drivers/net/ks8851.c 2009-12-07 11:29:02.000000000 +0000 @@ -46,19 +46,6 @@ struct ks8851_rxctrl { u16 rxcr2; }; -/** - * union ks8851_tx_hdr - tx header data - * @txb: The header as bytes - * @txw: The header as 16bit, little-endian words - * - * A dual representation of the tx header data to allow - * access to individual bytes, and to allow 16bit accesses - * with 16bit alignment. - */ -union ks8851_tx_hdr { - u8 txb[6]; - __le16 txw[3]; -}; /** * struct ks8851_net - KS8851 driver private data Index: b/drivers/net/ks8851.h =================================================================== --- a/drivers/net/ks8851.h 2009-12-07 11:26:50.000000000 +0000 +++ b/drivers/net/ks8851.h 2009-12-07 11:28:31.000000000 +0000 @@ -323,3 +323,17 @@ #define KS_SPIOP_WR (0x40) #define KS_SPIOP_RXFIFO (0x80) #define KS_SPIOP_TXFIFO (0xC0) + +/** + * union ks8851_tx_hdr - tx header data + * @txb: The header as bytes + * @txw: The header as 16bit, little-endian words + * + * A dual representation of the tx header data to allow + * access to individual bytes, and to allow 16bit accesses + * with 16bit alignment. + */ +union ks8851_tx_hdr { + u8 txb[6]; + __le16 txw[3]; +}; Index: b/drivers/net/ks8851_mll.c =================================================================== --- a/drivers/net/ks8851_mll.c 2009-12-07 11:24:46.000000000 +0000 +++ b/drivers/net/ks8851_mll.c 2009-12-07 11:28:49.000000000 +0000 @@ -72,20 +72,6 @@ static u8 KS_DEFAULT_MAC_ADDRESS[] = { 0 #define MAC_ADDR_LEN 6 /** - * union ks_tx_hdr - tx header data - * @txb: The header as bytes - * @txw: The header as 16bit, little-endian words - * - * A dual representation of the tx header data to allow - * access to individual bytes, and to allow 16bit accesses - * with 16bit alignment. - */ -union ks_tx_hdr { - u8 txb[4]; - __le16 txw[2]; -}; - -/** * struct ks_net - KS8851 driver private data * @net_device : The network device we're bound to * @hw_addr : start address of data register. @@ -137,7 +123,7 @@ struct ks_net { struct net_device *netdev; void __iomem *hw_addr; void __iomem *hw_addr_cmd; - union ks_tx_hdr txh ____cacheline_aligned; + union ks8851_tx_hdr txh ____cacheline_aligned; struct mutex lock; /* spinlock to be interrupt safe */ struct platform_device *pdev; struct mii_if_info mii;