From patchwork Tue Jun 25 23:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 167759 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp161674ilk; Tue, 25 Jun 2019 16:33:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCJwav9odqEkH1htRAJjwrObPBBaIglQhOIyrs1sTCdSZkePzm9yzXQ88HuzpIOcEJH8SV X-Received: by 2002:a17:902:7247:: with SMTP id c7mr1414000pll.202.1561505604861; Tue, 25 Jun 2019 16:33:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561505604; cv=none; d=google.com; s=arc-20160816; b=wEdhxSpSiec/1k3eQvY/h410eD0M97LzKMwn5UzI8nlTxJM+WWPfnMgev2aECDPQil JyuFofVSU6xojgKphdIMlEL+3GkUNhLD3UGAbd2x8eGsOsi4CP+xF3QzqRVwSYy7zA2O jdoJDxUYxIjiLavbcPYa2/CpNvmYTcJBLx/yDiegqq1kwAP8IPZ+fYeTm/wEV9ZOCjsN 8nFbA+YJ9a0WQiZ3kp16ZnVi/gPxVU8gtZQiMjxgdIrFsmlA/J7B56eh1ouvZJhatShn SGTqZzfLHEnLNJKNpaRrPAN6spMLfCFbLrLBgy76i5CLkEFJjTHqR8HEWapWVVOtV8Wu jFNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AVzFWkxY/+TevUuXjAygsKiDupRzaJUJJKQUGkuCQpQ=; b=HBa7q16dj1lgEkzlNZog/9B+JsMWywYiZQzvT2ix+cSh8f8/0OzODXD5+5uU0tcxW+ algkuTPwDSOoNz3+kVGApX6b6x0Lx+wKXw7oGydiihenL1h8fkjlLjmhIfyjxYE7gK/t XsdaNa3cc+bdDSSqJGv3mVlVCll6K81t+ohO/QihRqx6jM1rhu+p9oF7dOS0SV5rGfeD +GZgw+f4oVaNIGs0yq4RZEVRqm0bcsIXRBNtIcIoJX0WU59noSk9InK3TFYLzoblbO5i k0QKmDWQ2ZIGHz99DyONhlSLGSJZyuPxu244Go/BIUJUBws3x/QnA6CMaMdJ+Q1gq6z4 gxOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=TfOi+l6F; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u91si200118pjb.37.2019.06.25.16.33.24; Tue, 25 Jun 2019 16:33:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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=@ti.com header.s=ti-com-17Q1 header.b=TfOi+l6F; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726086AbfFYXdX (ORCPT + 5 others); Tue, 25 Jun 2019 19:33:23 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:47990 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726396AbfFYXdX (ORCPT ); Tue, 25 Jun 2019 19:33:23 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXLBn068434; Tue, 25 Jun 2019 18:33:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1561505601; bh=AVzFWkxY/+TevUuXjAygsKiDupRzaJUJJKQUGkuCQpQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TfOi+l6FOdAqxdrtstrC37sGrndaNQ0vbz1jcwQEUx8j0d/mbDeg/Re7r9mW8jHKC Dy6U5vKYPeCIMOmelSvMMCdI2Rt2o5GBd+K/pTPVz2zj9Dw+/5cxHk248C5sJwika2 fX/PoSLTSbttXSLyIiohmtl4BTXWnraSidbv1GMU= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x5PNXLNZ010781 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Jun 2019 18:33:21 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 25 Jun 2019 18:33:21 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 25 Jun 2019 18:33:21 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXL2i125252; Tue, 25 Jun 2019 18:33:21 -0500 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id x5PNXLm12241; Tue, 25 Jun 2019 18:33:21 -0500 (CDT) From: Suman Anna To: Tony Lindgren CC: Tero Kristo , Roger Quadros , , , Suman Anna Subject: [PATCH 3/5] bus: ti-sysc: Switch to SPDX license identifier Date: Tue, 25 Jun 2019 18:33:13 -0500 Message-ID: <20190625233315.22301-4-s-anna@ti.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190625233315.22301-1-s-anna@ti.com> References: <20190625233315.22301-1-s-anna@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Use the appropriate SPDX license identifier in the TI sysc interconnect target driver source files and drop the previous boilerplate license text. Also, add the the SPDX license identifier in the associated ti-sysc header files. Signed-off-by: Suman Anna --- drivers/bus/ti-sysc.c | 10 +--------- include/linux/platform_data/ti-sysc.h | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) -- 2.21.0 diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index e6deabd8305d..3030c9eadfb1 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1,14 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ti-sysc.c - Texas Instruments sysc interconnect target driver - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h index 0c587d4fc718..7d009dc08a54 100644 --- a/include/linux/platform_data/ti-sysc.h +++ b/include/linux/platform_data/ti-sysc.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + #ifndef __TI_SYSC_DATA_H__ #define __TI_SYSC_DATA_H__ From patchwork Tue Jun 25 23:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 167764 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp162081ilk; Tue, 25 Jun 2019 16:33:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+qV4DQKfYlOe7vvTULVHFDcKEU9z9DJXTfWQnufFE3aj19DCYdFGCH/4xLgLdQ9dmT222 X-Received: by 2002:a17:90a:1904:: with SMTP id 4mr544518pjg.116.1561505630980; Tue, 25 Jun 2019 16:33:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561505630; cv=none; d=google.com; s=arc-20160816; b=tyQMKv2+SniHI/gmdmyF6qzzyOOC7oBAvH1UazNvh7e7+7544oDQ2ntgVoMef4Mebc s7/qxEWAnOL01zfPHWkslC0KYOEAE8c4n9L48TaPX84qkQ3pdlhXwy34/iJi286XzJws pcTqBr1aOXZd2pDfvKNcEh2K/SQA6+0ad7Dv3LKFrX6h+XTWF3Ux6hDoGd7U+p7AQeOe lZy1X7pI9UCLze8R5r7swhS5qPMZD65Z1cRWtkyL6tC3f9J4hwOQkVH3499gtGoStrMI FADiuo0QUnz7KgI9ulMuUoWM7W6m8tNE6gctfN/LznJc58PvvCYVYuq4L78fxym/gkqP 8UMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LYYsn6FVz3dICPC1xjcrf+g4cuqCw9FM0ggDi0G05Kc=; b=CP/iYvX2VHdvlrlSCD8PSpaGyqJ0ZdPoODc8CVNwePKdRtzf+Dm3L65oTftazX1GI3 aPO+5MrdXlLNRc8h5/hVigNo8sAcK5/Au2WgfHcOGRRk882h09ndVjDTrJoO6ZHb6SMp rLb1hq4ppbV+9VXWQ7azXeeSaRc1YbPcZCtc8C4ie3yHvmXThICq3c0E4bASkVW58EpX iA408kVI7Wz0jK9MMW+ZZ17Zd4rzGgDRnhjf9pu9qaSiKJIbV/cpAG4HlG0eAQ9J74iP oi6pC8d8VnzFD9QaMeC7OfmWCV8IoXtptKMVAlKKCo9VGxPSSoYFWF4VTDnvv1b7G5Vh Fryg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=sFwzpKbL; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n75si226633pjc.27.2019.06.25.16.33.50; Tue, 25 Jun 2019 16:33:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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=@ti.com header.s=ti-com-17Q1 header.b=sFwzpKbL; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbfFYXdu (ORCPT + 5 others); Tue, 25 Jun 2019 19:33:50 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:42720 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725782AbfFYXdu (ORCPT ); Tue, 25 Jun 2019 19:33:50 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXM42125309; Tue, 25 Jun 2019 18:33:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1561505602; bh=LYYsn6FVz3dICPC1xjcrf+g4cuqCw9FM0ggDi0G05Kc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=sFwzpKbLCJ2IprsW6z9REMmMi1NEbB4UpkSJQIs2UhH6BkoY21nDhI9fofl1pQrAK Thv9NMcEjCWaZ8nDMjoXdLarfSV58pYF11YZONh/thO3m3YKNsERZEpL6aSvRbBl8B mZAFxV45y3dnRh2cqoWBfMgy6rgKr5766W0KPZcQ= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x5PNXLVu012960 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Jun 2019 18:33:22 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 25 Jun 2019 18:33:21 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 25 Jun 2019 18:33:21 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXLjl084713; Tue, 25 Jun 2019 18:33:21 -0500 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id x5PNXLm12247; Tue, 25 Jun 2019 18:33:21 -0500 (CDT) From: Suman Anna To: Tony Lindgren CC: Tero Kristo , Roger Quadros , , , Suman Anna Subject: [PATCH 4/5] bus: ti-sysc: Add missing kerneldoc comments Date: Tue, 25 Jun 2019 18:33:14 -0500 Message-ID: <20190625233315.22301-5-s-anna@ti.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190625233315.22301-1-s-anna@ti.com> References: <20190625233315.22301-1-s-anna@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org A few fields in various structures is missing the corresponding kerneldoc comments. Add them. Also, fixed the comment for sidlemodes. Signed-off-by: Suman Anna --- drivers/bus/ti-sysc.c | 7 +++++++ include/linux/platform_data/ti-sysc.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 3030c9eadfb1..ccdd1f0871f9 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -54,15 +54,22 @@ static const char * const clock_names[SYSC_MAX_CLOCKS] = { * @module_size: size of the interconnect target module * @module_va: virtual address of the interconnect target module * @offsets: register offsets from module base + * @mdata: ti-sysc to hwmod translation data for a module * @clocks: clocks used by the interconnect target module * @clock_roles: clock role names for the found clocks * @nr_clocks: number of clocks used by the interconnect target module + * @rsts: resets used by the interconnect target module * @legacy_mode: configured for legacy mode if set * @cap: interconnect target module capabilities * @cfg: interconnect target module configuration + * @cookie: data used by legacy platform callbacks * @name: name if available * @revision: interconnect target module revision + * @enabled: sysc runtime enabled status * @needs_resume: runtime resume needed on resume from suspend + * @child_needs_resume: runtime resume needed for child on resume from suspend + * @disable_on_idle: status flag used for disabling modules with resets + * @idle_work: work structure used to perform delayed idle on a module * @clk_enable_quirk: module specific clock enable quirk * @clk_disable_quirk: module specific clock disable quirk * @reset_done_quirk: module specific reset done quirk diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h index 7d009dc08a54..1a0905435b32 100644 --- a/include/linux/platform_data/ti-sysc.h +++ b/include/linux/platform_data/ti-sysc.h @@ -72,7 +72,7 @@ struct sysc_regbits { /** * struct sysc_capabilities - capabilities for an interconnect target module - * + * @type: sysc type identifier for the module * @sysc_mask: bitmask of supported SYSCONFIG register bits * @regbits: bitmask of SYSCONFIG register bits * @mod_quirks: bitmask of module specific quirks @@ -87,8 +87,9 @@ struct sysc_capabilities { /** * struct sysc_config - configuration for an interconnect target module * @sysc_val: configured value for sysc register + * @syss_mask: configured mask value for SYSSTATUS register * @midlemodes: bitmask of supported master idle modes - * @sidlemodes: bitmask of supported master idle modes + * @sidlemodes: bitmask of supported slave idle modes * @srst_udelay: optional delay needed after OCP soft reset * @quirks: bitmask of enabled quirks */ From patchwork Tue Jun 25 23:33:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 167761 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp161754ilk; Tue, 25 Jun 2019 16:33:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZn6e5GI8cYB73/bJPkvHAFYEuBdV5rPoqjVjW27RoXIl3NUgCfRiB4FyCiK7lthAJEB8D X-Received: by 2002:a17:90a:7d04:: with SMTP id g4mr518260pjl.41.1561505608783; Tue, 25 Jun 2019 16:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561505608; cv=none; d=google.com; s=arc-20160816; b=STVHxG3/jVY2BKd3AGL9+ekdiVVxmFoCz6OqephXfRtg24C18JzBCMPX6JFPN3eham S7/pjK4M8NbyHvWwxob9KtJxIudGRhhiF2Y5PeDmMrCJ7K4jPcwdf9Rl92D77Hkxi7XI P64YMuJ1FyiC193ncmayExlh/46u95RBWBRvi0R7q5URKJOcmeDw2mUbwS3yujEMLJ8/ adVIryI745WXY73gFSopS+dvEjwnrhlH/g2tg52B4pq/NrEcaPw6zSYS4NLDB4DN0CFJ UJKNGXfdhvlbUa4GFo19B0hJZVNNnpOpV5IUx+51mO73rEmiSF5BrisrI6k5KssRTxKJ hFEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hf5WBQjuZeCiIOSYjh2XZnVhPWosSAdGoW3RjyhnBbk=; b=JmRZAUOHIcRY8E7g+FlDeH5igM2R3Bzd2V0LNBoG4jm+fRX+xLXp0Hp1h4tEJR7GQw N4/poqfLXk+dvzWAUF6fxDajWanZrvXpm03UQFFbzKCb/LDlTpzprLSpAT19+BsjfJ22 O1R4uqD7ZTNe87BT4Y0cjri3X3gQOhKoLnvfjT47LvpB3ZF53SoWvwk46mMg/5vVDXCf k6I8FdJK1mu4pTbtdrWpCRSEt4eog9nJXDp9ZuVWtn42PuyIJkeuDh/j5YTDnjHT/DTx qYsJf+GAsFsUe4pxbpmNGcLVflJL2e7jeB7defrp8sz+MIoa2mRU+xfyJPSEZxABeaGU 6Z1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ehDaP4bL; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u91si200118pjb.37.2019.06.25.16.33.28; Tue, 25 Jun 2019 16:33:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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=@ti.com header.s=ti-com-17Q1 header.b=ehDaP4bL; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726443AbfFYXd1 (ORCPT + 5 others); Tue, 25 Jun 2019 19:33:27 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:34984 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726407AbfFYXdY (ORCPT ); Tue, 25 Jun 2019 19:33:24 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXMMg129970; Tue, 25 Jun 2019 18:33:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1561505602; bh=Hf5WBQjuZeCiIOSYjh2XZnVhPWosSAdGoW3RjyhnBbk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ehDaP4bLobbPg5838f2bwcWPaClKhU0ZfDqadWiVkxdaB+LzNsWrvlCJczKJ9U5dC GXssU8PCXam00m8jp3USZtVq03oa9BffdMTtXnoPaCiS0cB0wDHAge6GIHCtmH0Fjh gwd1yO8C0Aqo0xKFXYFyXo7hQVkrLtBIm+yaBzqg= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x5PNXMj3010797 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Jun 2019 18:33:22 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 25 Jun 2019 18:33:21 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 25 Jun 2019 18:33:21 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x5PNXLx3125267; Tue, 25 Jun 2019 18:33:21 -0500 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id x5PNXLm12251; Tue, 25 Jun 2019 18:33:21 -0500 (CDT) From: Suman Anna To: Tony Lindgren CC: Tero Kristo , Roger Quadros , , , Suman Anna Subject: [PATCH 5/5] bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() Date: Tue, 25 Jun 2019 18:33:15 -0500 Message-ID: <20190625233315.22301-6-s-anna@ti.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190625233315.22301-1-s-anna@ti.com> References: <20190625233315.22301-1-s-anna@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The clocks are not yet parsed and prepared until after a successful sysc_get_clocks(), so there is no need to unprepare the clocks upon any failure of any of the prior functions in sysc_probe(). The current code path would have been a no-op because of the clock validity checks within sysc_unprepare(), but let's just simplify the cleanup path by returning the error directly. While at this, also fix the cleanup path for a sysc_init_resets() failure which is executed after the clocks are prepared. Signed-off-by: Suman Anna --- drivers/bus/ti-sysc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.21.0 diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index ccdd1f0871f9..a7e704e0840d 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -2384,27 +2384,27 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_init_dts_quirks(ddata); if (error) - goto unprepare; + return error; error = sysc_map_and_check_registers(ddata); if (error) - goto unprepare; + return error; error = sysc_init_sysc_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_idlemodes(ddata); if (error) - goto unprepare; + return error; error = sysc_init_syss_mask(ddata); if (error) - goto unprepare; + return error; error = sysc_init_pdata(ddata); if (error) - goto unprepare; + return error; sysc_init_early_quirks(ddata); @@ -2414,7 +2414,7 @@ static int sysc_probe(struct platform_device *pdev) error = sysc_init_resets(ddata); if (error) - return error; + goto unprepare; error = sysc_init_module(ddata); if (error)