From patchwork Fri Aug 9 02:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 818259 Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) (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 ED67B17548 for ; Fri, 9 Aug 2024 02:08:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723169324; cv=none; b=SnmLRjEfWH3YhzMCT6nKA7ULYXQwiMVd4dmc+KUl5hBD+7QRVre/HiRnXhPu5Th2Mw43GdsDJ3PbOiTb/PZtVkYg6yEaGukWn2lg9w9a9wQaMPlwT8lIAZpMXBy0h/0xU7JmD3l8hg+5VGYxdW/qZk3jMkSPo77XrauyIF2ldFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723169324; c=relaxed/simple; bh=d1ewU+9RiQ97z8YJQgUpybfUfW9iq0BqSlv6sf7cU70=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PeUxsLJjKPl+LHyU49zVlsD7SUPzPyPtVh1nF3C2cEJxjYGeO1+OTiNdewv6WMyEMOuEv42bcIXJme4/rgiJUfKTI3wbHEwZNNIALKhO+DsMCO0WlGIypPhbmKc8e4NdulxMHVo9b+9hjYfR9KE9qBFnXtU7JSWdtuobX2GKbgk= 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=AxgDpJst; arc=none smtp.client-ip=209.85.160.43 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="AxgDpJst" Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-2644c1b07b1so120699fac.1 for ; Thu, 08 Aug 2024 19:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723169322; x=1723774122; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1G2DT4D6f+0grCLFuu/WTOqygdTNqUcbm73whybAszQ=; b=AxgDpJstYl50TpL0mp8/Z9q2OR5TkF+LR6y3aAPAvxBR2ycuD9mZNyIfNEWWSgi7mV QPioW+9J14dBEsNuyPVJ9Krybik1fznWEzG+h0/olngdgOguILbrMbFW9itJxzlsHgM9 cXFMCIuMu9JW4i83hBbbQRvpq5G1A3YOHoJawBuysFHNMLicfMHQYouuIvPwsvDrnb24 07SkgImMt89xJzJPjncKdBG8vHYZetwlWCPceZSIu9XOBXEPIk4I+VggcKJFNPf0sN/x 51dY0lYDXRsbUzfT0ak7Fd660D8JrfIdG2gHU6c+lPFjZgiPJJqBz3AdJhxsCjGE8JgC j2pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723169322; x=1723774122; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1G2DT4D6f+0grCLFuu/WTOqygdTNqUcbm73whybAszQ=; b=JVoq5tguhnq+jtPlobF7ReluIw+zWd/IlKafv3eYt7vlDTRz5yqTcpDd1vZ/2Ujluo gXIlN4C1xbpOt96MExW8sdaKHMEpgZjzj9QYqikbbQCXO9tIbMp1V3rNag71sPmICFaL ObY45+S4sprXzfdfY5/g8QUXKIsd2CSFCPqiEHrpqrg+YlMnzmFnvQp//226MXa0CEbe djQhjiXcM6dTD0tGQAok/kV6oe2dCk/sBfJVd8ZwKi0PR6uIZKSoPsVyH7wjjakOFpTj GdACfefDl3IfTICX1XU18Q5bbS7TNthUW8pGVHDiOcTgzipTVOXs6EfDFgZ0tayHOzV4 3mwg== X-Forwarded-Encrypted: i=1; AJvYcCW41qW8E1MX6IOeXesPF6H4wHVWtr7DQ5lOCu0bnXwX4w0ibYavElt+72BBTi0TZ0X8P/PPMimetrRUf6Fl7g==@vger.kernel.org X-Gm-Message-State: AOJu0YyWjvzuNNG6NV/n6D5Kw8E3OKX8Y5XavqfWblP30Uaj4zX4SUZb rCgL1ulXoUXlL9WRHqnTrcE/qjzd9H7AOtAHvojH1zKygG9HKkV9ZdAADQ== X-Google-Smtp-Source: AGHT+IEw/vkE8ghnhjtyL3fpNRtXvIkUByEmgT2v+M1R2Mk5zhXqv/1SqzTQXHTZvpNcfExzv5uQ1w== X-Received: by 2002:a05:6358:70c9:b0:1ac:f069:c64e with SMTP id e5c5f4694b2df-1b17725f7a5mr5600855d.5.1723169321878; Thu, 08 Aug 2024 19:08:41 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:d689:1e02:dd79:b72c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7b763562924sm10407746a12.33.2024.08.08.19.08.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 19:08:41 -0700 (PDT) From: Fabio Estevam To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, Fabio Estevam Subject: [PATCH 1/2] watchdog: imx2_wdt: Remove __maybe_unused notations Date: Thu, 8 Aug 2024 23:08:21 -0300 Message-Id: <20240809020822.335682-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Fabio Estevam Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle the .suspend/.resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use __maybe_unused notation. Signed-off-by: Fabio Estevam Reviewed-by: Guenter Roeck --- drivers/watchdog/imx2_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 42e8ffae18dd..4b3a192ee3e8 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -379,7 +379,7 @@ static void imx2_wdt_shutdown(struct platform_device *pdev) } /* Disable watchdog if it is active or non-active but still running */ -static int __maybe_unused imx2_wdt_suspend(struct device *dev) +static int imx2_wdt_suspend(struct device *dev) { struct watchdog_device *wdog = dev_get_drvdata(dev); struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); @@ -404,7 +404,7 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev) } /* Enable watchdog and configure it if necessary */ -static int __maybe_unused imx2_wdt_resume(struct device *dev) +static int imx2_wdt_resume(struct device *dev) { struct watchdog_device *wdog = dev_get_drvdata(dev); struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); @@ -435,8 +435,8 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, - imx2_wdt_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, + imx2_wdt_resume); static struct imx2_wdt_data imx_wdt = { .wdw_supported = true, @@ -476,7 +476,7 @@ static struct platform_driver imx2_wdt_driver = { .shutdown = imx2_wdt_shutdown, .driver = { .name = DRIVER_NAME, - .pm = &imx2_wdt_pm_ops, + .pm = pm_sleep_ptr(&imx2_wdt_pm_ops), .of_match_table = imx2_wdt_dt_ids, }, }; From patchwork Fri Aug 9 02:08:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 818549 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.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 8EAE8125BA for ; Fri, 9 Aug 2024 02:08:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723169326; cv=none; b=rJWCgy+rDKmcT+X8T644SO9Tygx2tVz0OE6vdYzPVe1WlD8wOyK8h0Jia7yQCiKEbRFeONZn3oG8suwCgdjQy8DSF69G4IUk/MEnPCk167dI90SLoHl9yCSUcNFSpJfuKVb+riokjQGZvIHfB+AA5zpCb5RCcwg6T1D/7QdYWTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723169326; c=relaxed/simple; bh=zO3fAi1hjoW5w7JNyHYT3tZ5xwpqpP5OILiG1e5qWQ0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kzyQuWoxs5xfxc+YYwNVLtEbwEtLcWNNRJuLV/DBkpOI2juY1Rz13KVhFRwDz+XFc44EFGhPKJ+Tem5ylyLB7OEAINolcL+kPEZMjAPNkw5ZAds9GYs4si3F6qBW90jIsIafbFPSdf6Yxgt45b+UGEUqQFa2VLEzYVk6ngpU+rE= 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=DfGfIZpQ; arc=none smtp.client-ip=209.85.210.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="DfGfIZpQ" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-70d2a6e31f1so112840b3a.3 for ; Thu, 08 Aug 2024 19:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723169325; x=1723774125; 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=TY6yxQSTwpDbwfBUbS/myD88LQg8gDkJm+T9qgpwOFY=; b=DfGfIZpQvycbTqt7tfpx+gM1+TFvU63x/ALggZPWj2lIVYEZvVfVJ3CcP2uSxAMOS8 kaO+NHbckNHPjYZbQXOfYUGVlaDQH36L0HWyUBNYK647myDqah6kGTNcQ/ZmfIsu1sEt 54gJndmhu++xAUulwFTzRSew7OzWvci2Ja5HGsB/+PvrthVVcLWUH1Hkyfqp1bIT+rud O4XtCFDae3lVUepL1S8UAk/pVrzqhH0fv7PcJGd1btj/qLAOFa0euC8Z1i/ER/kgUAuz N7mYH9/gbZ23aOuNYIBIOYqRgFJtYxXqN2TodhUxJMFLnNt1lYx38D12lY75HElM4t8W jNyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723169325; x=1723774125; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TY6yxQSTwpDbwfBUbS/myD88LQg8gDkJm+T9qgpwOFY=; b=UcU4mXNFioWvywx/03+HS0dYmthqMBxp9nwgnYWfCXgrr9K52n3Ae2okH7cPo7k4lJ f/wKSMRoeyfp9zM7yeBGQgHLZd9e21J4yBR0pqYO2JBIRknThxqyHTa0mewJfoAuEiO/ uVsj6l7nR/wPSgbL93v/J3dUaHnEcqCSSvuMkp2xVEqNcPIGkyGpDENcPchdMb5G0nj1 fi/RGWPNKarGBlaiIe0Q/h1VovJmD0uN91VzLVHH/fzMRhuPyquK3vvLwreUQBqww2dV qXyfpuOg3rha3IrFyL4Zu09w4wrs9PIM3p6zFSKnD+NmyFdv3LWAZFHvE+N5F+dYNV3r c4Sg== X-Forwarded-Encrypted: i=1; AJvYcCX4NTXzCzTqcoxy3Ty1H5Ua0FweM38hio1GOm3mpznlTXDCohvkyynN+p3qMkG/FQjMTbVVks9F4yH2Xzq9TQ==@vger.kernel.org X-Gm-Message-State: AOJu0YwaGdM6bAL+k3Jt/ppy+RP59PI8bhFmEg+9a8J1seE+m5SkQkwr 8azIGcBLfpOVzp1suOyWGL6MozcXOC6FT4ly4gSKHt1U0436ZZTIzS+xww== X-Google-Smtp-Source: AGHT+IGfQLuUhEkODFGpwkgdzsa3YtU3jZ0izEcufFu2yFX+2fZEfDLTAg4IBy+sukq5Al/Ii6TRvQ== X-Received: by 2002:a05:6a00:2d29:b0:70d:18e1:441c with SMTP id d2e1a72fcca58-710dc6cd1dcmr29151b3a.2.1723169324710; Thu, 08 Aug 2024 19:08:44 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:d689:1e02:dd79:b72c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7b763562924sm10407746a12.33.2024.08.08.19.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Aug 2024 19:08:44 -0700 (PDT) From: Fabio Estevam To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, Fabio Estevam Subject: [PATCH 2/2] watchdog: imx_sc_wdt: Remove __maybe_unused notations Date: Thu, 8 Aug 2024 23:08:22 -0300 Message-Id: <20240809020822.335682-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240809020822.335682-1-festevam@gmail.com> References: <20240809020822.335682-1-festevam@gmail.com> Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Fabio Estevam Use the DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() macros to handle the .suspend/.resume callbacks. These macros allow the suspend and resume functions to be automatically dropped by the compiler when CONFIG_SUSPEND is disabled, without having to use __maybe_unused notation. Signed-off-by: Fabio Estevam --- drivers/watchdog/imx_sc_wdt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c index e51fe1b78518..efd492b122f4 100644 --- a/drivers/watchdog/imx_sc_wdt.c +++ b/drivers/watchdog/imx_sc_wdt.c @@ -216,7 +216,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev) return devm_watchdog_register_device(dev, wdog); } -static int __maybe_unused imx_sc_wdt_suspend(struct device *dev) +static int imx_sc_wdt_suspend(struct device *dev) { struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev); @@ -226,7 +226,7 @@ static int __maybe_unused imx_sc_wdt_suspend(struct device *dev) return 0; } -static int __maybe_unused imx_sc_wdt_resume(struct device *dev) +static int imx_sc_wdt_resume(struct device *dev) { struct imx_sc_wdt_device *imx_sc_wdd = dev_get_drvdata(dev); @@ -236,8 +236,8 @@ static int __maybe_unused imx_sc_wdt_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops, - imx_sc_wdt_suspend, imx_sc_wdt_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(imx_sc_wdt_pm_ops, imx_sc_wdt_suspend, + imx_sc_wdt_resume); static const struct of_device_id imx_sc_wdt_dt_ids[] = { { .compatible = "fsl,imx-sc-wdt", }, @@ -250,7 +250,7 @@ static struct platform_driver imx_sc_wdt_driver = { .driver = { .name = "imx-sc-wdt", .of_match_table = imx_sc_wdt_dt_ids, - .pm = &imx_sc_wdt_pm_ops, + .pm = pm_sleep_ptr(&imx_sc_wdt_pm_ops), }, }; module_platform_driver(imx_sc_wdt_driver);