From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B80613BADB1 for ; Fri, 20 Mar 2026 13:56:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774015005; cv=none; b=CCiC0/pVrE2iN4RWlDlqLF+dxRJ5JIoGg+bEvEpLdQn4ZNE68YnragGk/g7HGIa8zl5RwzTICQw6xqRq7reiyVja+2EjjBk3IvEASVxetS3A2hA4Ydqj45hb3hbm1utiQNJrbjH8khHScuy0GOPDy9dYgXYfG5bjbeelolpHQ3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774015005; c=relaxed/simple; bh=DJqR/GuGiyjFacMfnO65zKo7aAil9mPZDEMDYiKQFnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XliYM6hpx73aev/5fSydx5BLf2xZqEVYaJfZ9CJ/qaiJPIUK0ex+org6S0Z3OisWUkHlFLZn1q9uhYDpiuSutCkGUIrg1uZ2jfKUT6rnAi4kc6mRXVtU9N9B93/m6885AtNapmdR51Jf8kQQd+JzO0z6ksTJlcs1Ho5LhMr/yps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IlcjXwoQ; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IlcjXwoQ" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-38a32d36396so18142221fa.0 for ; Fri, 20 Mar 2026 06:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774014994; x=1774619794; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YHTbck32azNpAhgT1Zm/ogIs8OYnc3TttHl66QfiMdA=; b=IlcjXwoQEW0x3H1bSZcbJHdDTF6h7z5E/KCN8fsgYqS6+YGFi1u1gb0mb2YauMUMW4 5HYXCtvREyAHQXkXZgbTOxyIbYjHERylRgxRCuFcqKM/zh9Wcp09TLNbSFb4V48x6P9c LQIlvdGHkhMVu8+WgTS97067mUUyYaQl6AyJkLzMP7j1+QAwdA1mXy0wS/FPzRgEXgI0 Ddhxo/dq8vKvs9xzVmFdHSsY4qaoxOeceOYmdl69RNGEguh0ZWt02okgaiLZRNzeK8wh 7F+gzjMZCODhpzxMBBTJdwC84lGSp83X0yRU5dEVzFAfIPbCbcxMX+CCE3KZBB6dKpC8 1JiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774014994; x=1774619794; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YHTbck32azNpAhgT1Zm/ogIs8OYnc3TttHl66QfiMdA=; b=JmKnIWGNNsdNciARtWAFv8f/31BzgdiTotIw5Zh35H8OMhJqEewHXx0KCohhzlX/Fy 99Y2vPedtI8IqvIoRcl3xpWR8i4cVCHCklK0IEir/ayPP/AYK6sZmoDbYWcdiGXx50kS 3/sCii4Lv53ub8tVEyEJqov0hiU7qE2ncY7TR/ioRFGbTvpQjgTZi8Qtcd6hYFXOoWVN MY0VfJwXY4Kv7h5UhYr2aQu35rZRk9cw81lvTDc2wD6MDKMyovXMwcV37vkpFBHKJ+2K PA9ocAbgfAAT/9btwNS0jGGQda59+i6miBXTy0UnjWbdxh8mo90K6UW5Y8j8Ju/2erKV VQXQ== X-Forwarded-Encrypted: i=1; AJvYcCXZgFcWttwibdwzBmmy1MK7b/vPgENabmkMyDKZlTxBeaWLyupyjeW2LCOD9NydC3DUPes7hpcMK0o6cRQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzGW4SzhP4PyJGuWTO/XqeLsSeNthEYhYy/QW0ibuDpV5YJBiJG 91pOyewh54CqOz+Oq0GDCooJF9HaO8Ex2b+qDIL+nPA6rmuu6HBXHNkF X-Gm-Gg: ATEYQzyImVMhPbsDeK0dY66iCh8VIZbmu2DDiC+KVkLFK+Ui60yty2rxzYp7HXjoezz rbFUtksY+80RV66GU9fRSgnlVnS2G5ouRQ3b2iNrjnUkbEwqa3QmRXg1UDgNfR3RpsznjJ0OxV9 6+Uf/ruBBgslAXRP9diY6HmZErcebn3xr4dQkEnxc+w6/vvEMgziCihkoL6bQDQu59ocfb7FoxB nVqDV3anN+dZC7qVuU8EO8YbjZexUFojI+cEq0OxQzljWLgyrciBHtfPlrThyffZClq0eJmMs+B r71ai6pUBVaGynmezGl+YR1TsecV4ORdcx2D5IYlK8NGQbSllJ2HnFb+F94m/P33rZ1sV1AMkP+ ryIB+Dm0KPqxFlxPAq5G4CHRsPSJQmvfS4UrieeDmDC+3NLMJ4fIXTWSQUR//aKyJL3nFYJQjLm bvxDzNUpmcDO/a/f5QcblvMgvbE//AGlsDBls/6stMHg== X-Received: by 2002:a05:651c:4209:b0:38a:4e8d:747 with SMTP id 38308e7fff4ca-38bf9c9d8d6mr8871791fa.1.1774014994190; Fri, 20 Mar 2026 06:56:34 -0700 (PDT) Received: from NB-6746.corp.yadro.com ([188.243.183.148]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-38bf97709d9sm5468761fa.18.2026.03.20.06.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 06:56:33 -0700 (PDT) From: Artem Shimko To: wim@linux-watchdog.org, linux@roeck-us.net, p.zabel@pengutronix.de, Sergey.Semin@baikalelectronics.ru, mika.westerberg@linux.intel.com, andi.shyti@kernel.org Cc: Artem Shimko , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] watchdog: dw_wdt: clean up error paths in resume function Date: Fri, 20 Mar 2026 16:56:22 +0300 Message-ID: <20260320135624.223863-6-a.shimko.dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260320135624.223863-1-a.shimko.dev@gmail.com> References: <20260320135624.223863-1-a.shimko.dev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Clean up of dw_wdt_resume() function. Rework the error handling to use properly named labels that match the cleanup order. Use unprepare_clk for clock disable and unprepare_pclk for pclk disable path. Signed-off-by: Artem Shimko --- drivers/watchdog/dw_wdt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index c2c5dc6e54e7..c89e1fb91b1f 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -393,16 +393,15 @@ static int dw_wdt_suspend(struct device *dev) static int dw_wdt_resume(struct device *dev) { struct dw_wdt *dw_wdt = dev_get_drvdata(dev); - int err = clk_prepare_enable(dw_wdt->clk); + int err; + err = clk_prepare_enable(dw_wdt->clk); if (err) return err; err = clk_prepare_enable(dw_wdt->pclk); - if (err) { - clk_disable_unprepare(dw_wdt->clk); - return err; - } + if (err) + goto unprepare_clk; err = reset_control_deassert(dw_wdt->rst); if (err) @@ -415,8 +414,9 @@ static int dw_wdt_resume(struct device *dev) return 0; -unprepare_clk: +unprepare_pclk: clk_disable_unprepare(dw_wdt->pclk); +unprepare_clk: clk_disable_unprepare(dw_wdt->clk); return err; -- 2.43.0