From patchwork Sun Apr 10 20:55:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 8794971 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 059919F3D1 for ; Sun, 10 Apr 2016 20:55:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58207201ED for ; Sun, 10 Apr 2016 20:55:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 372812022D for ; Sun, 10 Apr 2016 20:55:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756395AbcDJUzW (ORCPT ); Sun, 10 Apr 2016 16:55:22 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:34662 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbcDJUzT (ORCPT ); Sun, 10 Apr 2016 16:55:19 -0400 Received: by mail-lf0-f45.google.com with SMTP id j11so132781678lfb.1 for ; Sun, 10 Apr 2016 13:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:organization:user-agent :in-reply-to:references:mime-version:content-transfer-encoding; bh=Aqw6+16MXJ1s3tShReMpURBt0C/S5IfPWCpgF2VACtA=; b=ebSq24gM0rx9O/Norn/0UjJO0TrCqiW6cuDT0TQA0XXYnlr9nVekX2D+6bhNW4Karj KRlTSUWWjJTLcifqp1ihKT/Vj/TVGZpXGHWenkslJrJMvbsJeNGWqHu9doIP5FStrCT3 Vx95n7mwauMFYQM96CE5ReH9VgV+CxYjivC36IkplV7R+bYMGgE2Ho4/Bch6BlMSuxme oEjIqu5yT073F66DsMGFa5IJQgl9VnFVDWQ4Z+gQhJa04QzYhpBpDBopgEkKtL6ls4rm vriUFfk5Ivg+pqmbjAh/IPN4Duf9u/AxTWvb06tQWnEjBJyEa6YM0BnIL+ZCzFucIbc8 k0pQ== 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:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding; bh=Aqw6+16MXJ1s3tShReMpURBt0C/S5IfPWCpgF2VACtA=; b=LkPRTDjFPxjvFnPRWwvX4fH7IpsAx/u5mjPhYkQ7KncdNmdFtBGYGiXpmhT5D53nd8 QY5eKEJa995cQtq3INaYeykMQrdMuA71UEQPqHGKednxS9w1QtPvcdLwUsuRkEeQ3Ww5 IRA//Oi1RFUVMXcuuIoynvh9qV+05WxVY+aMjWTKS64Z0BMj1Bitf18uZisHcGVUxyXV ekLmro3u1seM6Y1WV1ci633sKtlqZ5FKyo21aSF+tPw2s3yhohq37I5F2IxHhL7vzscs 8xJ5417lHIm6QijLRhom3RMPaf3LhMM75nPJ91lT7emMAwsekb1LgrrQle7J08z6Xm8Y qQiw== X-Gm-Message-State: AOPr4FWbKlOPJyXVdEFuQWaVSFETWfRXEFsxvK9RjEgUZySPgF/QyMYtuYR6UzdbkNvdeQ== X-Received: by 10.25.207.73 with SMTP id f70mr464169lfg.131.1460321717914; Sun, 10 Apr 2016 13:55:17 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.80.164]) by smtp.gmail.com with ESMTPSA id y77sm3939238lfd.15.2016.04.10.13.55.16 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Apr 2016 13:55:16 -0700 (PDT) From: Sergei Shtylyov To: netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Subject: [PATCH] ravb: make ravb_ptp_interrupt() *void* Date: Sun, 10 Apr 2016 23:55:15 +0300 Message-ID: <6123492.pMMRNT1FnA@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.4.6-201.fc22.x86_64; KDE/4.14.17; x86_64; ; ) In-Reply-To: <2504091.pf4fyK11eg@wasted.cogentembedded.com> References: <2504091.pf4fyK11eg@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 When we have the ISS.CGIS bit set, we already know that gPTP interrupt has happened, so an extra GIS register check at the end of ravb_ptp_interrupt() seems superfluous. We can model the gPTP interrupt handler like all other dedicated interrupt handlers in the driver and make it *void*. Signed-off-by: Sergei Shtylyov --- The patch is against the Dave Miller's 'net-next.git' repo. drivers/net/ethernet/renesas/ravb.h | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 8 ++++++-- drivers/net/ethernet/renesas/ravb_ptp.c | 9 ++------- 3 files changed, 9 insertions(+), 10 deletions(-) Index: net-next/drivers/net/ethernet/renesas/ravb.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/ravb.h +++ net-next/drivers/net/ethernet/renesas/ravb.h @@ -1045,7 +1045,7 @@ void ravb_modify(struct net_device *ndev u32 set); int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value); -irqreturn_t ravb_ptp_interrupt(struct net_device *ndev); +void ravb_ptp_interrupt(struct net_device *ndev); void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev); void ravb_ptp_stop(struct net_device *ndev); Index: net-next/drivers/net/ethernet/renesas/ravb_main.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/ravb_main.c +++ net-next/drivers/net/ethernet/renesas/ravb_main.c @@ -807,8 +807,10 @@ static irqreturn_t ravb_interrupt(int ir } /* gPTP interrupt status summary */ - if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED) + if (iss & ISS_CGIS) { + ravb_ptp_interrupt(ndev); result = IRQ_HANDLED; + } mmiowb(); spin_unlock(&priv->lock); @@ -838,8 +840,10 @@ static irqreturn_t ravb_multi_interrupt( } /* gPTP interrupt status summary */ - if ((iss & ISS_CGIS) && ravb_ptp_interrupt(ndev) == IRQ_HANDLED) + if (iss & ISS_CGIS) { + ravb_ptp_interrupt(ndev); result = IRQ_HANDLED; + } mmiowb(); spin_unlock(&priv->lock); Index: net-next/drivers/net/ethernet/renesas/ravb_ptp.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/ravb_ptp.c +++ net-next/drivers/net/ethernet/renesas/ravb_ptp.c @@ -296,7 +296,7 @@ static const struct ptp_clock_info ravb_ }; /* Caller must hold the lock */ -irqreturn_t ravb_ptp_interrupt(struct net_device *ndev) +void ravb_ptp_interrupt(struct net_device *ndev) { struct ravb_private *priv = netdev_priv(ndev); u32 gis = ravb_read(ndev, GIS); @@ -319,12 +319,7 @@ irqreturn_t ravb_ptp_interrupt(struct ne } } - if (gis) { - ravb_write(ndev, ~gis, GIS); - return IRQ_HANDLED; - } - - return IRQ_NONE; + ravb_write(ndev, ~gis, GIS); } void ravb_ptp_init(struct net_device *ndev, struct platform_device *pdev)