From patchwork Wed Dec 11 23:58:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 3329251 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F1AAE9F1F0 for ; Wed, 11 Dec 2013 23:57:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AE0220800 for ; Wed, 11 Dec 2013 23:57:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2453F207EF for ; Wed, 11 Dec 2013 23:57:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751905Ab3LKX5U (ORCPT ); Wed, 11 Dec 2013 18:57:20 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:51178 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879Ab3LKX5S (ORCPT ); Wed, 11 Dec 2013 18:57:18 -0500 Received: by mail-pb0-f46.google.com with SMTP id md12so10981197pbc.33 for ; Wed, 11 Dec 2013 15:57:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0OjYjx40N4PqFbhO/vhrFZm+wfEcGN6tX39SKJVzuok=; b=Y3oCrn4ijknQlOtGg18JUbnDUBNj3udAIwBr5oGvQyxdp8zhHLzZuIOBIcu/1zFkAh NSmVtOHD6bCAwuSB7/MUw0qBbHLi9E8u6SYCMVAcQ5V9MUDZxeZjo7Ytf/PKZVU/nFTC rL7qCCOlXUF+tlnFwcBkO3OUWw8SPESNEcmzIJOaeDDWdntxzLRnA2/Zk3AoN+og9nSE xKpd6it148T8z0qkU1T2Bb6OGoZ5ErxCgTHaiaiZsuNj1hsQj4IJnoW7qsBCCF0RrgK+ CJ/gKy2E+96Ju5zZR2J77uv+eywNpy9wThd8SB0G+CZA3Kaix7QOUfouWumB5vkm8aL5 E6mw== X-Gm-Message-State: ALoCoQnw5kGCxQDqYAj9UCUkjQtwvrdm2LDTVTWPEN8x/z78/hUx/ywu0skwjGqonY/p0RHPyKJP X-Received: by 10.68.6.99 with SMTP id z3mr6103386pbz.114.1386806237865; Wed, 11 Dec 2013 15:57:17 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id vh3sm35483316pbc.8.2013.12.11.15.57.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 15:57:17 -0800 (PST) From: Olof Johansson To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Olof Johansson Subject: [PATCH] net: eth: cpsw: 64-bit phys_addr_t and sparse cleanup Date: Wed, 11 Dec 2013 15:58:07 -0800 Message-Id: <1386806287-6564-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Minor fix for printk format of a phys_addr_t, and the switch of two local functions to static since they're not used outside of the file. Signed-off-by: Olof Johansson --- Missed this one with the previous 64-bit phys_addr_t fix. Feel free to fold it in, or apply separately. -Olof drivers/net/ethernet/ti/cpsw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c8a54f9..915eca9 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -582,7 +582,7 @@ static void cpsw_intr_disable(struct cpsw_priv *priv) return; } -void cpsw_tx_handler(void *token, int len, int status) +static void cpsw_tx_handler(void *token, int len, int status) { struct sk_buff *skb = token; struct net_device *ndev = skb->dev; @@ -599,7 +599,7 @@ void cpsw_tx_handler(void *token, int len, int status) dev_kfree_skb_any(skb); } -void cpsw_rx_handler(void *token, int len, int status) +static void cpsw_rx_handler(void *token, int len, int status) { struct sk_buff *skb = token; struct sk_buff *new_skb; @@ -2142,8 +2142,8 @@ static int cpsw_probe(struct platform_device *pdev) data->cpts_clock_mult, data->cpts_clock_shift)) dev_err(priv->dev, "error registering cpts device\n"); - cpsw_notice(priv, probe, "initialized device (regs %x, irq %d)\n", - ss_res->start, ndev->irq); + cpsw_notice(priv, probe, "initialized device (regs %pa, irq %d)\n", + &ss_res->start, ndev->irq); if (priv->data.dual_emac) { ret = cpsw_probe_dual_emac(pdev, priv);