Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1304689imm; Fri, 11 May 2018 14:17:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpM+cEho4VokWhqkbFdJi5GMZNFvjdeqH0+VBbJ8X1CYVdPKe4Jz3I1NWpO4z3zwkVbUBvZ X-Received: by 2002:a63:724e:: with SMTP id c14-v6mr494594pgn.277.1526073460094; Fri, 11 May 2018 14:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526073460; cv=none; d=google.com; s=arc-20160816; b=StcVE22jex43dguYGMXH0Mm9ufCFwMOpVVRFxelg9/NdEjOEeBKiY/uaBakyYbVtEG 9h662FYmqvy+FkxL6W/ZhfIAyRMqCs37h0uwSRv7fbdwsAM5vU0B4eNHGFUy0moOR+3e 5Yzz04js65lPP3e9QoJ/5DaZVW+ovOsw+YkTyahuvkUhm3szRE3KFKoDgZXs6/RIMj6i gmpbodi4hsKTkLyHdtae7OD4j2BxwTT2C1mFAaJG5rRAd5OnFb1d4zqNu7JFexIYO/ta QYpP5MwUIo4ikIcURrDwnK39Jb2wsQ+47pcG8Y4VWrxix3iJ9eK7f8HhbijN0Dh1ZeaW IB/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=P4jz8AmInkJWmVBLoHKGp6bWT9lIUCEFYTy1VCQUlLg=; b=lKwFwV4PrrQTEfKwblNRAv05pnFsj3ef9xJGys6xIOseZ5t1hrAWHg3fqTvqKfITTr IWM4ZPATpPB61tUpWLrXoB4IzTiVePOlavzhCmXvxLyTc1ePIKcqveDIeRasgeR8h5vr Amp1x8yaHDFb29mG8Ib0UoDMYNDiaenX90jkxogHj90WTyHV0pG+gNhWBnafZk6eRBai AIcnsNoHtG94C2rFP0XTVOO9pw/M/v7AX8j4ucF3ky+sVv+6QO2QyyVBJoWpD+afT8W+ 4S6z2wX4J51oquNXSGunbAjzTCbVRy+v0WzoLS/EQTurvNpleAn99Y6gjubrVzMdQRKk TE6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v6-v6si4201032plp.60.2018.05.11.14.17.25; Fri, 11 May 2018 14:17:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbeEKVQ5 (ORCPT + 99 others); Fri, 11 May 2018 17:16:57 -0400 Received: from mail.savoirfairelinux.com ([208.88.110.44]:37204 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbeEKVQx (ORCPT ); Fri, 11 May 2018 17:16:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 2FCB49C347F; Fri, 11 May 2018 17:16:53 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id nPiCn6zihiWX; Fri, 11 May 2018 17:16:52 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id B37CF9C3483; Fri, 11 May 2018 17:16:52 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ETbxenj7VJlm; Fri, 11 May 2018 17:16:52 -0400 (EDT) Received: from weeman.mtl.sfl (unknown [192.168.49.104]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 896709C347F; Fri, 11 May 2018 17:16:52 -0400 (EDT) From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, Vivien Didelot , davem@davemloft.net, andrew@lunn.ch, f.fainelli@gmail.com Subject: [PATCH net-next 3/3] net: dsa: mv88e6xxx: add a stats setup function Date: Fri, 11 May 2018 17:16:36 -0400 Message-Id: <20180511211636.25995-4-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511211636.25995-1-vivien.didelot@savoirfairelinux.com> References: <20180511211636.25995-1-vivien.didelot@savoirfairelinux.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the Global 1 specific setup function only setup the statistics unit, kill it in favor of a mv88e6xxx_stats_setup function. Signed-off-by: Vivien Didelot --- drivers/net/dsa/mv88e6xxx/chip.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index df92fed44674..a4efc6544c0d 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -995,14 +995,6 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port, } -static int mv88e6xxx_stats_set_histogram(struct mv88e6xxx_chip *chip) -{ - if (chip->info->ops->stats_set_histogram) - return chip->info->ops->stats_set_histogram(chip); - - return 0; -} - static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port) { return 32 * sizeof(u16); @@ -2267,14 +2259,16 @@ static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds, return err; } -static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip) +static int mv88e6xxx_stats_setup(struct mv88e6xxx_chip *chip) { int err; /* Initialize the statistics unit */ - err = mv88e6xxx_stats_set_histogram(chip); - if (err) - return err; + if (chip->info->ops->stats_set_histogram) { + err = chip->info->ops->stats_set_histogram(chip); + if (err) + return err; + } return mv88e6xxx_g1_stats_clear(chip); } @@ -2300,11 +2294,6 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) goto unlock; } - /* Setup Switch Global 1 Registers */ - err = mv88e6xxx_g1_setup(chip); - if (err) - goto unlock; - err = mv88e6xxx_irl_setup(chip); if (err) goto unlock; @@ -2368,6 +2357,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) goto unlock; } + err = mv88e6xxx_stats_setup(chip); + if (err) + goto unlock; + unlock: mutex_unlock(&chip->reg_lock); -- 2.17.0