From patchwork Wed Nov 7 18:14:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 197698 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 5BB962C0156 for ; Thu, 8 Nov 2012 05:15:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753931Ab2KGSPe (ORCPT ); Wed, 7 Nov 2012 13:15:34 -0500 Received: from mail-lb0-f174.google.com ([209.85.217.174]:60048 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732Ab2KGSPS (ORCPT ); Wed, 7 Nov 2012 13:15:18 -0500 Received: by mail-lb0-f174.google.com with SMTP id n3so1512078lbo.19 for ; Wed, 07 Nov 2012 10:15:18 -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=hlwKm8YmeCHeQbkBHZvFdYw9GUISqkADnhV2FK4fAew=; b=FGiX8Uq5uNwk3nE8hOHsrioyWI82vYQmGA2tREFTXOmrekz38WJI7K+WcnafA0dUze Uhum92RKJX/ULl0eJHeebLemqPtE12WvXcyZ9cHXOMCVuYJLWvWFc6yipKXwDQ4nabT3 dsg8VQK9HKkYFevJXRlu9+kTcjQECuW9Bo1RKRsEkJfM0LJfTU6o1BJleqv02Lqp03wX r8GW6VnNulm9BCxX9W3qPcFpjxCgc5/5xm3/6fPowC9xHV7DoT4hrYGRo7GOJzENgHBq OZdUh4Q6eRZhQFnAH42YXZAS3s0z0D+5C6+pVHqLlsPIP3w4SrL8pnG7G3PAXjC0Ctcv hH4Q== Received: by 10.112.101.133 with SMTP id fg5mr2283139lbb.3.1352312117922; Wed, 07 Nov 2012 10:15:17 -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.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 10:15:17 -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 6/8] net/at91_ether: drop board_data private struct member Date: Wed, 7 Nov 2012 19:14:55 +0100 Message-Id: <1352312097-31320-7-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 No longer used after gpio phy interrupt support was removed from at91_ether. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/cadence/at91_ether.c | 2 -- drivers/net/ethernet/cadence/macb.h | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index 65a9afa..67b66c4 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c @@ -387,8 +387,6 @@ static int __init at91ether_probe(struct platform_device *pdev) lp = netdev_priv(dev); lp->pdev = pdev; lp->dev = dev; - if (board_data) - lp->board_data = *board_data; spin_lock_init(&lp->lock); dev->base_addr = regs->start; /* physical base address */ diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 97f74dd..864e380 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -557,12 +557,7 @@ struct macb { phy_interface_t phy_interface; - /* at91_private */ - struct macb_platform_data board_data; /* board-specific - * configuration (shared with - * macb for common data */ - - /* Transmit */ + /* AT91RM9200 transmit */ struct sk_buff *skb; /* holds skb until xmit interrupt completes */ dma_addr_t skb_physaddr; /* phys addr from pci_map_single */ int skb_length; /* saved skb length for pci_unmap_single */