From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933300Ab1JRQKD (ORCPT ); Tue, 18 Oct 2011 12:10:03 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:47634 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932917Ab1JRQKA (ORCPT ); Tue, 18 Oct 2011 12:10:00 -0400 From: Mark Einon To: gregkh@suse.de Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Mark Einon Subject: [RESEND][PATCH 11/26] staging: et131x: Moving two extern inline functions to .c file Date: Tue, 18 Oct 2011 17:07:44 +0100 Message-Id: <1318954079-16666-12-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1318954079-16666-1-git-send-email-mark.einon@gmail.com> References: <1318954079-16666-1-git-send-email-mark.einon@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Two helper functions for adding 10bit/12bit umbers with wrapping are defined in the header. Moved them to the driver .c file. Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 11 +++++++++++ drivers/staging/et131x/et131x.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 9596102..14f54e4 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -2666,6 +2666,17 @@ void et131x_rx_dma_enable(struct et131x_adapter *adapter) } } + +static inline void add_10bit(u32 *v, int n) +{ + *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP); +} + +static inline void add_12bit(u32 *v, int n) +{ + *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP); +} + /** * nic_rx_pkts - Checks the hardware for available packets * @adapter: pointer to our adapter diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h index 84b274d..7eed3c8 100644 --- a/drivers/staging/et131x/et131x.h +++ b/drivers/staging/et131x/et131x.h @@ -230,16 +230,6 @@ struct global_regs { /* Location: */ #define INDEX10(x) ((x) & ET_DMA10_MASK) #define INDEX4(x) ((x) & ET_DMA4_MASK) -extern inline void add_10bit(u32 *v, int n) -{ - *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP); -} - -extern inline void add_12bit(u32 *v, int n) -{ - *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP); -} - /* * 10bit DMA with wrap * txdma tx queue write address reg in txdma address map at 0x1010 -- 1.7.6.4