From nobody Thu Feb 12 09:23:41 2026 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A67D51494D1; Thu, 13 Jun 2024 16:42:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718296952; cv=none; b=HuHc988/JI7R94NT498hDH0lyGqTfYoLx4Du+FMzKH284H6a1XASkWQjjs3wfi9uDrSvOuajz2Kb/kNjGEcnkORM5W0Xqtb3oxFQJoEoahysfmOmHqqEKWcZaTyLkiTpJk3J5oR12hDyd2X6O1MVpn6oNqgQX2Q0EJmVH4QAOEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718296952; c=relaxed/simple; bh=Rwt9PdDlBPU1Mtk8I78hJCVMn23gkkE1PpUlz0qmemU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cDOJiFy4/FRVOVVKYtFxeFM8uorFTLXP+pV/HgEkVCHnTU1zLUiHzBvZ10gSuaMNSXgq8BU5Xqk9ZZBww+gJQLiRxrCoawnfys6wtxsaXYkzSW3Qwnt508f+aYVKPRToleWZ5AGVSnCVagIHtP1lHt/gG5AYZvtEyRRYZSmi+t0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=hqJIAeaq; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="hqJIAeaq" Received: by mail.gandi.net (Postfix) with ESMTPSA id 63AF2FF806; Thu, 13 Jun 2024 16:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1718296942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4dJR3hHbvgKmOl5sUDZdsAffIZFQ6lBPh0rzTj8sNRs=; b=hqJIAeaqOGMgsL2S+VuFTO8+j4NW7CjsmyX26xsMZdv4kQdapRvADPzBTIBGaU1ZsGWI19 od+G7uXc9+Nd1sHNGsr5Ck77HElrJqF7nek+xBxiGYVRTwC532NwufMKnFBhGmH5wFh2A6 MCEZA31gAoBan5ilW75Kv/3h1iJatr7z/Mad283QjSGMMBIYlS80HsaZzz2BtBAgW4S1cl TGm+iqZpaqt1F2MKT6HktF9/zm4J2ZXrBdFCn5efLHuotbPxcu8h9LrOPBD5kn4KwT+G2Z jOF9RknNfjZuAxfWN0ffW4RCNNGyhieuHzmdUVi+E7s5Vh1FTr0tIm+6q5U2aw== From: Thomas Richard To: wim@linux-watchdog.org, linux@roeck-us.net Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brunner@kontron.com, thomas.richard@bootlin.com, thomas.petazzoni@bootlin.com Subject: [PATCH] watchdog: kempld: use pretimeout member of watchdog_device struct Date: Thu, 13 Jun 2024 18:41:57 +0200 Message-Id: <20240613164157.457693-1-thomas.richard@bootlin.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: thomas.richard@bootlin.com Content-Type: text/plain; charset="utf-8" Th driver was written whereas pretimeout wasn't supported by the watchdog core. So the pretimeout was stored in the driver data. Now the core has pretimeout support, so use it. Signed-off-by: Thomas Richard --- drivers/watchdog/kempld_wdt.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index e6c7a2906680..ebb873502203 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c @@ -73,7 +73,6 @@ struct kempld_wdt_stage { struct kempld_wdt_data { struct kempld_device_data *pld; struct watchdog_device wdd; - unsigned int pretimeout; struct kempld_wdt_stage stage[KEMPLD_WDT_MAX_STAGES]; u8 pm_status_store; }; @@ -205,8 +204,8 @@ static int kempld_wdt_set_timeout(struct watchdog_devic= e *wdd, timeout_stage =3D &wdt_data->stage[STAGE_TIMEOUT]; pretimeout_stage =3D &wdt_data->stage[STAGE_PRETIMEOUT]; =20 - if (pretimeout_stage->mask && wdt_data->pretimeout > 0) - timeout =3D wdt_data->pretimeout; + if (pretimeout_stage->mask && wdd->pretimeout > 0) + timeout =3D wdd->pretimeout; =20 ret =3D kempld_wdt_set_stage_action(wdt_data, timeout_stage, ACTION_RESET); @@ -249,13 +248,14 @@ static int kempld_wdt_set_pretimeout(struct watchdog_= device *wdd, if (ret) return ret; =20 - wdt_data->pretimeout =3D pretimeout; + wdd->pretimeout =3D pretimeout; return 0; } =20 static void kempld_wdt_update_timeouts(struct kempld_wdt_data *wdt_data) { struct kempld_device_data *pld =3D wdt_data->pld; + struct watchdog_device *wdd =3D &wdt_data->wdd; struct kempld_wdt_stage *pretimeout_stage; struct kempld_wdt_stage *timeout_stage; unsigned int pretimeout, timeout; @@ -269,11 +269,11 @@ static void kempld_wdt_update_timeouts(struct kempld_= wdt_data *wdt_data) kempld_release_mutex(pld); =20 if (pretimeout) - wdt_data->pretimeout =3D timeout; + wdd->pretimeout =3D timeout; else - wdt_data->pretimeout =3D 0; + wdd->pretimeout =3D 0; =20 - wdt_data->wdd.timeout =3D pretimeout + timeout; + wdd->timeout =3D pretimeout + timeout; } =20 static int kempld_wdt_start(struct watchdog_device *wdd) @@ -336,7 +336,6 @@ static int kempld_wdt_keepalive(struct watchdog_device = *wdd) static long kempld_wdt_ioctl(struct watchdog_device *wdd, unsigned int cmd, unsigned long arg) { - struct kempld_wdt_data *wdt_data =3D watchdog_get_drvdata(wdd); void __user *argp =3D (void __user *)arg; int ret =3D -ENOIOCTLCMD; int __user *p =3D argp; @@ -352,7 +351,7 @@ static long kempld_wdt_ioctl(struct watchdog_device *wd= d, unsigned int cmd, ret =3D kempld_wdt_keepalive(wdd); break; case WDIOC_GETPRETIMEOUT: - ret =3D put_user(wdt_data->pretimeout, (int __user *)arg); + ret =3D put_user(wdd->pretimeout, (int __user *)arg); break; } =20 --=20 2.39.2