Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Meng Li <Meng.Li@windriver.com>
To:     wg@grandegger.com, mkl@pengutronix.de, davem@davemloft.net,
        kuba@kernel.org, mailhol.vincent@wanadoo.fr,
        socketcan@hartkopp.net, ramesh.shanmugasundaram@bp.renesas.com
Cc:     linux-can@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org, meng.li@windriver.com
Subject: [PATCH] driver: net: can: disable clock when it is in enable status
Date:   Tue, 19 Oct 2021 17:14:16 +0800
Message-Id: <20211019091416.16923-1-Meng.Li@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TKWuEZxlB9gU0CWhdVVOGRaRZAHsqhDtM8pfmLphu/P2AMQCEf8yK7/ceGGq?=
 =?us-ascii?Q?iloWwctfOhlNoaiMwPaE0EN2aSOo0huHYwZVz3PnTv/kebCu7pZg9Jx+y5Vs?=
 =?us-ascii?Q?41fys0r7t0EpJSkptmai73Iy7FVtIOUoNDh7ynulRfyMzYDthzOFYiflkQuO?=
 =?us-ascii?Q?mXLaaZ+gYiQv5WX6MRFrK0W5ez2SSG4iY7ymZ0UjP92F3e18vBGCUzvpFcjh?=
 =?us-ascii?Q?NJtUZBCxSFiBzb2zxPfA8beD4QmWuIZ5lbJxGoydnkpmE3qlBoaCiaH8bTVM?=
 =?us-ascii?Q?GHrbT1j/wCk+T5MhmFPqN8UiQN2+W7KOQX/Za2hsi8+v9+2kJQ41xAbYBtMk?=
 =?us-ascii?Q?WoK2Qe+HuqkXX9gmxwVyhlONxAF1rTK/2xpIUlzArSgMuMy5fs7D236Ql7uW?=
 =?us-ascii?Q?OCEczNgmln/BWODaLcCksOdEUUcdTYdfV116I/Ams+XUauGoE7MzEvdIZasy?=
 =?us-ascii?Q?1U/Y7MVEbQWHtEwo6oNywbR26BMuPz5SLE9brk5l+odeZyPQtNB2kXjU66o3?=
 =?us-ascii?Q?MdrtWLAYfUdge4iSxa+XUknPStuiWMBLo0IjFH4R5Khh7epTLtfxMf7Ur6MH?=
 =?us-ascii?Q?/Ruf2Ylq85KvnaR7BVjMzVzBqq4pEHLfHHy/Ar+ogm5GXdQCxt9N8oDQOOWy?=
 =?us-ascii?Q?o77wNeGqlAmdQOCUiFunHUjSw31A42U8ZBvPUI2DGfagf4QBxEereshT7vxc?=
 =?us-ascii?Q?ixQxZmSNIlVhDzIzUyCj60fTr0Y+nlqzjRdj9K6BY2y5Fjmx4Yj9l4tInqMJ?=
 =?us-ascii?Q?9HOxM+/JakuCLQOOpLxPVUdi3xPqFTzTu2wnQw0qo6Ymom56C//rcvCGvrzz?=
 =?us-ascii?Q?UwD6cpZ2RTq1M2jDa6VyP67743RNKFUNLKVz7NH7rdgtxUo6cpkpLE7WWe8I?=
 =?us-ascii?Q?TsQdkg3nR0BSJjgYI6U81MTXYPHl6Vd2hf9DOpVctHZMTMlDxr/XOdDCOVsF?=
 =?us-ascii?Q?bHWDzVQnThhYFZYsDVsqnE3hM/xJ0yb6+QcgPyIhZm7yDyIGJspxMx3wVUhP?=
 =?us-ascii?Q?cBDrMwyW+Ly+D5a6N3Ld8h7sviqLvMedptQ/GlEY5OcouSFCAt/DcBDF/QkT?=
 =?us-ascii?Q?BVf+cNIG3wfGZciKH2NsxxQ2WWk+lp8PruAHac9qqriELRiza+iNFE26Bpll?=
 =?us-ascii?Q?cgVPanCXD9LR0P3yPgSNNo/z+hBffLH6zwTvPs3Me4Cgv6wZonD1O9jAbSIR?=
 =?us-ascii?Q?KPMUwueUzmQM2HxrAcgLmhvA9JPsGyV+mO2ittTbDe8s00KpMuafKRFnwmMs?=
 =?us-ascii?Q?R+PwYirEpxF/l+/k95TEoFez7fZMcKJ6ksrxN/U8DjfY4FxnGMB7GGPY0qgD?=
 =?us-ascii?Q?OuDzmtn8RFdAm2HC/6BXLYqr?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 87c6ece2-ac8a-4f4b-7931-08d992e0ee23
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 09:15:01.8324
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: her1UKag0IzzHyZIfP9nzXixZ5Jll2UibgO1xndOC3xLh8Qbb+jAtDa9MUWCnHki2wP1gG+o/pgrdmdoB6Fg4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4901
X-Proofpoint-ORIG-GUID: 9AiDFZcj2Zba1GiuMmqxmBtyRPn9Qi-2
X-Proofpoint-GUID: 9AiDFZcj2Zba1GiuMmqxmBtyRPn9Qi-2
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-10-18_07,2021-10-18_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=559
 impostorscore=0 suspectscore=0 clxscore=1011 priorityscore=1501
 adultscore=0 lowpriorityscore=0 phishscore=0 spamscore=0 malwarescore=0
 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109230001 definitions=main-2110190056
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If disable a clock when it is already in disable status, there
will be a warning trace generated. So, it is need to confirm
whether what status the clock is in before disable it.

Fixes: a23b97e6255b ("can: rcar_can: Move Renesas CAN driver to rcar dir")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/net/can/rcar/rcar_can.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 48575900adb7..e340e32cd145 100644
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -15,6 +15,7 @@
 #include <linux/can/led.h>
 #include <linux/can/dev.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/of.h>
 
 #define RCAR_CAN_DRV_NAME	"rcar_can"
@@ -857,7 +858,9 @@ static int __maybe_unused rcar_can_suspend(struct device *dev)
 	writew(ctlr, &priv->regs->ctlr);
 	priv->can.state = CAN_STATE_SLEEPING;
 
-	clk_disable(priv->clk);
+	if(__clk_is_enabled(priv->clk))
+		clk_disable(priv->clk);
+
 	return 0;
 }
 
-- 
2.17.1