From patchwork Wed Jun 19 22:22:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2752291 Return-Path: X-Original-To: patchwork-linux-sh@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 143CC9F8E1 for ; Wed, 19 Jun 2013 22:23:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBE5F201E3 for ; Wed, 19 Jun 2013 22:23:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBCDB201DE for ; Wed, 19 Jun 2013 22:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935096Ab3FSWW5 (ORCPT ); Wed, 19 Jun 2013 18:22:57 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:61923 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935023Ab3FSWW4 (ORCPT ); Wed, 19 Jun 2013 18:22:56 -0400 Received: by mail-la0-f43.google.com with SMTP id gw10so5146791lab.30 for ; Wed, 19 Jun 2013 15:22:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=to:subject:cc:from:organization:date:mime-version:content-type :content-transfer-encoding:message-id:x-gm-message-state; bh=xYRyQb8PV24GBNJyrqFSFqgIuLJL34/DJqOxPxVvLmc=; b=OwYX9er2ti7TeUxiIhFHxmEU2cdo9Afhx+yFZmxPFZotHarFrGyn+mHrPRIyEOpU07 0mjBC6juIeEqKL8V36wEJuS874Nk/gU/ui6paHCjtmK1Y5o4gcMvdTL7CkFR3RSAc3CS 8OEZBF2yeugJ0pYZnbNS/i376I6z0WWg9bJ8N4XGDN18mH7D96ccXPO7sCRvAeL/F0zK v12mkb7jY0eu22o5ikElzVqpFCxW60Ue9bRU0RzkbuYITgWLSCs97r6rq9Sby/auSe+9 spm+bcK8EJk7rnTgQT4Z/0LfNG1dOMOZiUkf3sfbDo6rjR0WkDsbSIr4ojr8XiHHs74A 1d2g== X-Received: by 10.112.164.164 with SMTP id yr4mr4235874lbb.88.1371680574822; Wed, 19 Jun 2013 15:22:54 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-156-235.pppoe.mtu-net.ru. [91.76.156.235]) by mx.google.com with ESMTPSA id i9sm8578944lai.4.2013.06.19.15.22.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Jun 2013 15:22:53 -0700 (PDT) To: netdev@vger.kernel.org Subject: [PATCH 1/3] sh_eth: remove 'tx_error_check' field of 'struct sh_eth_cpu_data' Cc: nobuhiro.iwamatsu.yj@renesas.com, linux-sh@vger.kernel.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Thu, 20 Jun 2013 02:22:56 +0400 MIME-Version: 1.0 Message-Id: <201306200222.56406.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmP/2ioZt6udWLTQU2avE6q0VElX0prS2Bcc/1wcYGNOLkqJc09m2XM4PZu/zHOcThH8rnS Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.2 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 The 'tx_error_check' field of 'struct sh_eth_cpu_data' is write-only, so remove it along with the DEFAULT_TX_ERROR_CHECK macro. Signed-off-by: Sergei Shtylyov --- The patch is against the Dave Miller's 'net-next.git' repo plus the NAPI patches that I've reposted yesterday. drivers/net/ethernet/renesas/sh_eth.c | 14 -------------- drivers/net/ethernet/renesas/sh_eth.h | 3 --- 2 files changed, 17 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -384,7 +384,6 @@ static struct sh_eth_cpu_data r8a777x_da .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, .apr = 1, .mpr = 1, @@ -420,7 +419,6 @@ static struct sh_eth_cpu_data sh7724_dat .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, .apr = 1, .mpr = 1, @@ -457,7 +455,6 @@ static struct sh_eth_cpu_data sh7757_dat .tx_check = EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO, .eesr_err_check = EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, - .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, .irq_flags = IRQF_SHARED, .apr = 1, @@ -527,8 +524,6 @@ static struct sh_eth_cpu_data sh7757_dat .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ EESR_ECI, - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ - EESR_TFE, .fdr_value = 0x0000072f, .rmcr_value = 0x00000001, @@ -587,8 +582,6 @@ static struct sh_eth_cpu_data sh7734_dat .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ EESR_ECI, - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ - EESR_TFE, .apr = 1, .mpr = 1, @@ -616,8 +609,6 @@ static struct sh_eth_cpu_data sh7763_dat .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ EESR_ECI, - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ - EESR_TFE, .apr = 1, .mpr = 1, @@ -655,8 +646,6 @@ static struct sh_eth_cpu_data r8a7740_da .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \ EESR_ECI, - .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \ - EESR_TFE, .apr = 1, .mpr = 1, @@ -706,9 +695,6 @@ static void sh_eth_set_default_cpu_data( if (!cd->eesr_err_check) cd->eesr_err_check = DEFAULT_EESR_ERR_CHECK; - - if (!cd->tx_error_check) - cd->tx_error_check = DEFAULT_TX_ERROR_CHECK; } static int sh_eth_check_reset(struct net_device *ndev) Index: net-next/drivers/net/ethernet/renesas/sh_eth.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/drivers/net/ethernet/renesas/sh_eth.h @@ -261,8 +261,6 @@ enum EESR_BIT { #define DEFAULT_EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | \ EESR_RDE | EESR_RFRMER | EESR_ADE | \ EESR_TFE | EESR_TDE | EESR_ECI) -#define DEFAULT_TX_ERROR_CHECK (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | \ - EESR_TFE) /* EESIPR */ enum DMAC_IM_BIT { @@ -468,7 +466,6 @@ struct sh_eth_cpu_data { /* interrupt checking mask */ unsigned long tx_check; unsigned long eesr_err_check; - unsigned long tx_error_check; /* hardware features */ unsigned long irq_flags; /* IRQ configuration flags */