From patchwork Wed Nov 7 18:14:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 197693 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 6DA3F2C0168 for ; Thu, 8 Nov 2012 05:15:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753821Ab2KGSPU (ORCPT ); Wed, 7 Nov 2012 13:15:20 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:38659 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748Ab2KGSPP (ORCPT ); Wed, 7 Nov 2012 13:15:15 -0500 Received: by mail-la0-f46.google.com with SMTP id h6so1452444lag.19 for ; Wed, 07 Nov 2012 10:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=jOpx4b/MCTO258C3FcAyzB63SBgTdOCw7GpCICQJkFI=; b=rgOViC8eztA6RVZ1fq97kkdUcNbz/CmWA3Nze52XLcKPWGJLoaLmd3sNoyCqjveEsy xweUmtcHZGk+Uj4vWu5t1U5oLp+p49YmIvBH5+snkqv9PSafYprMM/khABACs92RRZ75 BuGOtuaodBiSNro/4X56U4r1MKHwZyyCnHVle1cmluImWvlrr9wvZnCymP5Z8ZFy149Z j3HavihXn/34u475x4KH3Jx9cyRgS7BYG5t18N6ujAQ4/Yitee8h63weZyYAW+Q8SdEe 00egTNsTAiDqDkRr9Pt8+s4lvtuAdh+3Z7pX8AT0HAO+JOxm+eRpNkS+vzBlsbXH5zGU 73nw== Received: by 10.152.106.79 with SMTP id gs15mr5101347lab.31.1352312114987; Wed, 07 Nov 2012 10:15:14 -0800 (PST) Received: from localhost.localdomain (57.90-149-223.nextgentel.com. [90.149.223.57]) by mx.google.com with ESMTPS id b4sm8383536lbi.0.2012.11.07.10.15.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 10:15:14 -0800 (PST) From: Joachim Eastwood To: nicolas.ferre@atmel.com, davem@davemloft.net Cc: plagnioj@jcrosoft.com, netdev@vger.kernel.org, Joachim Eastwood Subject: [PATCH 3/8] net/macb: export macb_set_hwaddr and macb_get_hwaddr Date: Wed, 7 Nov 2012 19:14:52 +0100 Message-Id: <1352312097-31320-4-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352312097-31320-1-git-send-email-manabian@gmail.com> References: <1352312097-31320-1-git-send-email-manabian@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org for usage in at91_ether driver. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/cadence/macb.c | 8 +++++--- drivers/net/ethernet/cadence/macb.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index a9e5a50..6be5a26 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -98,7 +98,7 @@ static void *macb_rx_buffer(struct macb *bp, unsigned int index) return bp->rx_buffers + RX_BUFFER_SIZE * macb_rx_ring_wrap(index); } -static void __macb_set_hwaddr(struct macb *bp) +void macb_set_hwaddr(struct macb *bp) { u32 bottom; u16 top; @@ -108,8 +108,9 @@ static void __macb_set_hwaddr(struct macb *bp) top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4))); macb_or_gem_writel(bp, SA1T, top); } +EXPORT_SYMBOL_GPL(macb_set_hwaddr); -static void __init macb_get_hwaddr(struct macb *bp) +void macb_get_hwaddr(struct macb *bp) { struct macb_platform_data *pdata; u32 bottom; @@ -149,6 +150,7 @@ static void __init macb_get_hwaddr(struct macb *bp) netdev_info(bp->dev, "invalid hw address, using random\n"); eth_hw_addr_random(bp->dev); } +EXPORT_SYMBOL_GPL(macb_get_hwaddr); static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum) { @@ -1035,7 +1037,7 @@ static void macb_init_hw(struct macb *bp) u32 config; macb_reset_hw(bp); - __macb_set_hwaddr(bp); + macb_set_hwaddr(bp); config = macb_mdc_clk_div(bp); config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */ diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 4235ab8..d723494 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -573,6 +573,8 @@ extern const struct ethtool_ops macb_ethtool_ops; int macb_mii_init(struct macb *bp); int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); void macb_set_rx_mode(struct net_device *dev); +void macb_set_hwaddr(struct macb *bp); +void macb_get_hwaddr(struct macb *bp); static inline bool macb_is_gem(struct macb *bp) {