From patchwork Thu Jan 18 20:59:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125028 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp293854lja; Thu, 18 Jan 2018 12:59:59 -0800 (PST) X-Google-Smtp-Source: ACJfBovpf9V6zXtJXiTp2vtXiztkBQjg8HMCddGuUu1ByRiRHuORvoeDl2kQsQJETx3DDjRbeXUr X-Received: by 10.101.85.195 with SMTP id k3mr26515240pgs.191.1516309198898; Thu, 18 Jan 2018 12:59:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309198; cv=none; d=google.com; s=arc-20160816; b=xXgt7bUKj9a1nNJf+GIe1knEaFfMg9QS02g4BS9q/5NjV8ckfXfHeiY19BkhUsd4lv zJG1AuwRh6581exjzDyulVybBuw+q5GQoM+4WQlb9KEQJaoOx8U6mf1sys9jz28hqL7J 31TIfsku5ycac7RfWo13g2IxWpF0ijaIwLs/H2X6v2GW2jRzRJVKtE2bkN9EP6asY8eX Ys0fLw5uC+wPonhvv/gQAUNnCdweqG2bIzUXBtS47RfGl4zMdKcOYjXZdnfQwkMkFoD2 XOiLS97fci7qY8QYm6U5fi8sbpWKUxTQnXUYZIHZhtKBnkNMQdS4of5ss6BcdsT/c5Sk KBFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=gXIXPtw8tbe4+9JAP1j3G0klU7zrqFe63IOCKNscRDs=; b=gLi1WsEW2m3jEFUtK/ImtYfWXrIyupemOJNR5V3d9Tc6wCRA+iLYIRt/AMHgLxeo6L ujtwbWr/K7IrSt6RcFZv3ndAVfWe6NjcjgR3D4VlFmjMz40QNV0c4R5IPD+X2Spj4x6c vXW1vsD+IyNMps5/B7xzO+o/5LXin4ZnfxHSI8a0IbI58rvvA0JKQ330PMjbehtXf1W3 I/WYbme2KnwOqOlpRCb7EeUIjN+Pg8LgogtZPgpanmpUYXbdLt9lgNwe305OvxVSsqXK JE7Hk0JPjsRccPdafhPIWkkvTnV/pqhNS782hlfFMplrscmJ6BKYcDlzrAT8hKycthFY NHnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=GzZLFiLM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.12.59.58; Thu, 18 Jan 2018 12:59:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=GzZLFiLM; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753808AbeARU75 (ORCPT + 10 others); Thu, 18 Jan 2018 15:59:57 -0500 Received: from mail-by2nam01on0120.outbound.protection.outlook.com ([104.47.34.120]:44880 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932393AbeARU7r (ORCPT ); Thu, 18 Jan 2018 15:59:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gXIXPtw8tbe4+9JAP1j3G0klU7zrqFe63IOCKNscRDs=; b=GzZLFiLMcRKu8tS/J74+ucw3Z95JtA/5puVWOSs0NpmhNzewle+VzR3qrHJIxktNejX0oR29BjnBdLBdGVox87SugLUrEzlAUbc2bXnglTxqJEGrbgrAsuoJS5jqgNZWAR0ldLhm87+STiyZmWdJVrHo8DqbOqXs5coFDDNGDF4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1064.namprd21.prod.outlook.com (52.132.130.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.7; Thu, 18 Jan 2018 20:59:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 20:59:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Ralf Baechle , "Sasha Levin" Subject: [added to the 4.1 stable tree] MIPS: ralink: Remove unused rt*_wdt_reset functions Thread-Topic: [added to the 4.1 stable tree] MIPS: ralink: Remove unused rt*_wdt_reset functions Thread-Index: AQHTkJ9AEooeJjLy106dOb2P0xmu5g== Date: Thu, 18 Jan 2018 20:59:38 +0000 Message-ID: <20180118205908.3220-28-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1064; 7:JruPh+bK373AyMSc9ekdxTQXWZ+w5PYMDm8FoSqjjUh/B6XB1IMLshly3GWNUb1m2RdD1RYAf51N7ySzyU47dBvfb/Q5XNadYWr+NQf4USGqvUOXVZNotXWpcVGo1N2a/T1D04OPK/tyMf0BQmuGsVLBJjnJhzwDE0v6dsnB6Pr0SWNiREEqsfv0C1n5hXKAYbnP6AbvsmYMNUDdmnvMge06mo+xR71JnUJy3+wKYyDRx0GQFBkTNCszWJIJpffS x-ms-office365-filtering-correlation-id: 458ed4a7-fe64-4cf7-f457-08d55eb664a4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB1064; x-ms-traffictypediagnostic: DM5PR2101MB1064: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(198206253151910); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(5005006)(8121501046)(3231046)(2400067)(944501161)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041282)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB1064; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB1064; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(106356001)(25786009)(68736007)(107886003)(2900100001)(26005)(105586002)(102836004)(8676002)(4326008)(6506007)(14454004)(76176011)(86612001)(81156014)(10090500001)(8936002)(86362001)(72206003)(966005)(81166006)(5250100002)(6346003)(2501003)(478600001)(10290500003)(99286004)(2950100002)(305945005)(53936002)(2906002)(5660300001)(3846002)(1076002)(66066001)(6116002)(22452003)(316002)(6512007)(110136005)(54906003)(3280700002)(6436002)(3660700001)(97736004)(6306002)(36756003)(7736002)(6486002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1064; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: znYj5ptnz5jOwsRr6NqoZVP3PA/q3y8CzE+csqw4jIf/+psKdFeNKaLeFFcbfpxp+NWsXrSVz4bKjUcLOkGVGA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 458ed4a7-fe64-4cf7-f457-08d55eb664a4 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 20:59:38.2915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1064 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 886f9c69fc68f56ddea34d3de51ac1fc2ac8dfbc ] All pointers to these functions were removed, so now they produce warnings: arch/mips/ralink/rt305x.c:92:13: error: 'rt305x_wdt_reset' defined but not used [-Werror=unused-function] This removes the functions. If we need them again, the patch can be reverted later. Fixes: f576fb6a0700 ("MIPS: ralink: cleanup the soc specific pinmux data") Signed-off-by: Arnd Bergmann Cc: John Crispin Cc: Colin Ian King Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15044/ Signed-off-by: Ralf Baechle Signed-off-by: Sasha Levin --- arch/mips/ralink/rt288x.c | 10 ---------- arch/mips/ralink/rt305x.c | 11 ----------- arch/mips/ralink/rt3883.c | 10 ---------- 3 files changed, 31 deletions(-) diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c index 738cec865f41..1bd7d704b01b 100644 --- a/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c @@ -40,16 +40,6 @@ static struct rt2880_pmx_group rt2880_pinmux_data_act[] = { { 0 } }; -static void rt288x_wdt_reset(void) -{ - u32 t; - - /* enable WDT reset output on pin SRAM_CS_N */ - t = rt_sysc_r32(SYSC_REG_CLKCFG); - t |= CLKCFG_SRAM_CS_N_WDT; - rt_sysc_w32(t, SYSC_REG_CLKCFG); -} - void __init ralink_clk_init(void) { unsigned long cpu_rate, wmac_rate = 40000000; diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index c40776ab67db..28bf6fbe8b04 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -91,17 +91,6 @@ static struct rt2880_pmx_group rt5350_pinmux_data[] = { { 0 } }; -static void rt305x_wdt_reset(void) -{ - u32 t; - - /* enable WDT reset output on pin SRAM_CS_N */ - t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG); - t |= RT305X_SYSCFG_SRAM_CS0_MODE_WDT << - RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT; - rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG); -} - static unsigned long rt5350_get_mem_size(void) { void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE); diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c index 5bda39fea483..d7998819954a 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c @@ -63,16 +63,6 @@ static struct rt2880_pmx_group rt3883_pinmux_data[] = { { 0 } }; -static void rt3883_wdt_reset(void) -{ - u32 t; - - /* enable WDT reset output on GPIO 2 */ - t = rt_sysc_r32(RT3883_SYSC_REG_SYSCFG1); - t |= RT3883_SYSCFG1_GPIO2_AS_WDT_OUT; - rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1); -} - void __init ralink_clk_init(void) { unsigned long cpu_rate, sys_rate;