From:   Meng Li <Meng.Li@windriver.com>
To:     stable@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
        mcoquelin.stm32@gmail.com, linux@armlinux.org.uk, andrew@lunn.ch,
        qiangqing.zhang@nxp.com
Cc:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        meng.li@windriver.com
Subject: [PATCH 2/6] net: stmmac: platform: fix build error with !CONFIG_PM_SLEEP
Date:   Fri, 19 Nov 2021 10:53:55 +0800
Message-Id: <20211119025359.30815-3-Meng.Li@windriver.com>
In-Reply-To: <20211119025359.30815-1-Meng.Li@windriver.com>
References: <20211119025359.30815-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?DIhkEtJ5MrdHNK1NQVOqOS/eZGTDhMFQkwssE1/714GK4w8vvyeFwdxgXMu9?=
 =?us-ascii?Q?EZrR/e8FuTjcpx88vlT4qgjGfY0+s9d1F+o6HaJSuezbitdkNrgG07G5/gTV?=
 =?us-ascii?Q?uNMWKTJb2BypJT08bIyAIOdn0WnHvNjUqlLeOOInE9xFHXOXUOp7m8VA0Nrk?=
 =?us-ascii?Q?PjhviFMHX8GAZCp5RIv/q6IYldg4XT07ReZwtUAcECCIkTeAxgpv4UeGKgjW?=
 =?us-ascii?Q?7F1GJKRbrUJxWzB9czOxvaMnAz5uC4MMFIWGSEXNXNoyP//qNGLW1gaMJV6U?=
 =?us-ascii?Q?qD/q6F45KCzVzszF+kYwn3lI8ZbYiXD3nrdJc/nW7piaitxlC3FWyaDl7rRm?=
 =?us-ascii?Q?LX8Hv17dfW9IQxqnPPYQV/NHEUHHBU4drb5mMYBExTTw+PKOjjlErQym7cPY?=
 =?us-ascii?Q?5SBIDKv8km3FM7rMAOixXakpCc1ar3jdNbfPJ+rdr63dhzz5c+bx+Hf2Iles?=
 =?us-ascii?Q?EJxS9N3z93wM53KoDLCjBOkmTmr8rR2GtoGJ3B5JQf/PwftYDIl5xaBN6Haf?=
 =?us-ascii?Q?//ObqrVW7DJl+WPBZP0bixp3uSzNI+0ynsdl+E+WveS5TbY8XK1MGqX7VYFj?=
 =?us-ascii?Q?6xSsL+x4Fl3fHPU9QzbZYoAz+Ru2jvw9PRyauR8fVwG1OKhWddGJmY1Sv0/C?=
 =?us-ascii?Q?KzBHgwbJldP3HX5CRK0lQawlwLS7A/mEG3b9nMxswNC5ZHrsWgx4rc3XUUgH?=
 =?us-ascii?Q?3AVjcvMuwjBsTksVqiHV92KbqkBJFWsBTLYrBMZ5gLeSZ6nkxvjRuPZHDirf?=
 =?us-ascii?Q?AoCjzRS75SYFmLBEDACtdSeMOqyEXZ4gByaEl/fRRbe3ijM68pgQdA9Dv7f5?=
 =?us-ascii?Q?6qn5RROgpk80sX/+3TYUssPQWv0igxV12wZcgVpVN5J0m8+haobQadwEBkqa?=
 =?us-ascii?Q?XOviMntqRWEX3ZoqBoBJLk6qFpFENZXK84EuFlRiYJ1Y8Ta9HjhgxNuMjar8?=
 =?us-ascii?Q?CQ23t4MoSYkROPYX6D51ubBp9+VsiyqHWTyaM2ii+upX+cWiGsgHg0hKO2LO?=
 =?us-ascii?Q?D/PctUBBWyn3NsrUxxQYM4U5gYlj9jPAm/6bjRKB44xwZZZDOu6VndJyu59F?=
 =?us-ascii?Q?lV3ALMESmmTYA7c7B6uhGh7XBO7+YLfFkZPfqXMs2ExCOTrCEzjwlvAW4RGV?=
 =?us-ascii?Q?gT5svrC1vLJHyana/LwcA1XqgBr9fLT7Wcl6VXKlMyjjLDWnatweAydKev7D?=
 =?us-ascii?Q?488oUE9OIdzQGfnzuSziY9SiG7KTSuDzkyP6pVf5l/Ysm7v5/kql/6kxXqao?=
 =?us-ascii?Q?3uoIPvJR6MchUCXtoZhAy5/seaarXkpKmu9TV8RHv8lh3QkX+Gn3C+kg+DyW?=
 =?us-ascii?Q?l4G5r/0Uvxj1hFTbOn3bnnLh21lp184mkovwDAvWOH4VIaHIEksnYRMfLbkD?=
 =?us-ascii?Q?H4snDjjLmcmrw+shfjIJ7frJK/pFt6izOtsLQHF1/915W4DTZ4LkvgnwVKaF?=
 =?us-ascii?Q?mM9dm4xUubMjoT7OKI0ZHAQnxrXiZ9N8vQpJ13T2rNB3UP2OX95LyxMi0hgG?=
 =?us-ascii?Q?yALIB1NnkYH7KTl/NfKaysxLo/m5JYtgHDyFNc3SVdgqAYFVLkjs32gqJIof?=
 =?us-ascii?Q?KvzfG0CYABEFuCgLzgjBjU6LWEWXGin3+DaXNzdOse5mhGhHosNIhV5iApjJ?=
 =?us-ascii?Q?sgQwrfSvhHhupWz0AKTAbIY=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 05056d73-8b98-444e-6966-08d9ab07e655
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 02:54:26.8477
 (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: v3gGO25lOwCW3rWtL6hT7H8uehrYcKSIfy9UK6YBLRftnR6kgWNaWBFPGfyC1JRwahN0KPTaL6CEYFOhv+UWMg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4951
X-Proofpoint-GUID: AuoiQcD_AgojlDxR3dFSwA2GpFcReEMw
X-Proofpoint-ORIG-GUID: AuoiQcD_AgojlDxR3dFSwA2GpFcReEMw
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-11-19_02,2021-11-17_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0
 spamscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501
 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2111190012
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Wei Yongjun <weiyongjun1@huawei.com>

commit 7ec05a6035480f3a5934b2b31222620b2e906163 upstream

Get rid of the CONFIG_PM_SLEEP ifdefery to fix the build error
and use __maybe_unused for the suspend()/resume() hooks to avoid
build warning:

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:769:21:
 error: 'stmmac_runtime_suspend' undeclared here (not in a function); did you mean 'stmmac_suspend'?
  769 |  SET_RUNTIME_PM_OPS(stmmac_runtime_suspend, stmmac_runtime_resume, NULL)
      |                     ^~~~~~~~~~~~~~~~~~~~~~
./include/linux/pm.h:342:21: note: in definition of macro 'SET_RUNTIME_PM_OPS'
  342 |  .runtime_suspend = suspend_fn, \
      |                     ^~~~~~~~~~
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:769:45:
 error: 'stmmac_runtime_resume' undeclared here (not in a function)
  769 |  SET_RUNTIME_PM_OPS(stmmac_runtime_suspend, stmmac_runtime_resume, NULL)
      |                                             ^~~~~~~~~~~~~~~~~~~~~
./include/linux/pm.h:343:20: note: in definition of macro 'SET_RUNTIME_PM_OPS'
  343 |  .runtime_resume = resume_fn, \
      |                    ^~~~~~~~~

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 332afe8519f4..035f9aef4308 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -720,7 +720,6 @@ int stmmac_pltfr_remove(struct platform_device *pdev)
 }
 EXPORT_SYMBOL_GPL(stmmac_pltfr_remove);
 
-#ifdef CONFIG_PM_SLEEP
 /**
  * stmmac_pltfr_suspend
  * @dev: device pointer
@@ -728,7 +727,7 @@ EXPORT_SYMBOL_GPL(stmmac_pltfr_remove);
  * call the main suspend function and then, if required, on some platform, it
  * can call an exit helper.
  */
-static int stmmac_pltfr_suspend(struct device *dev)
+static int __maybe_unused stmmac_pltfr_suspend(struct device *dev)
 {
 	int ret;
 	struct net_device *ndev = dev_get_drvdata(dev);
@@ -749,7 +748,7 @@ static int stmmac_pltfr_suspend(struct device *dev)
  * the main resume function, on some platforms, it can call own init helper
  * if required.
  */
-static int stmmac_pltfr_resume(struct device *dev)
+static int __maybe_unused stmmac_pltfr_resume(struct device *dev)
 {
 	struct net_device *ndev = dev_get_drvdata(dev);
 	struct stmmac_priv *priv = netdev_priv(ndev);
@@ -761,7 +760,7 @@ static int stmmac_pltfr_resume(struct device *dev)
 	return stmmac_resume(dev);
 }
 
-static int stmmac_runtime_suspend(struct device *dev)
+static int __maybe_unused stmmac_runtime_suspend(struct device *dev)
 {
 	struct net_device *ndev = dev_get_drvdata(dev);
 	struct stmmac_priv *priv = netdev_priv(ndev);
@@ -771,14 +770,13 @@ static int stmmac_runtime_suspend(struct device *dev)
 	return 0;
 }
 
-static int stmmac_runtime_resume(struct device *dev)
+static int __maybe_unused stmmac_runtime_resume(struct device *dev)
 {
 	struct net_device *ndev = dev_get_drvdata(dev);
 	struct stmmac_priv *priv = netdev_priv(ndev);
 
 	return stmmac_bus_clks_config(priv, true);
 }
-#endif /* CONFIG_PM_SLEEP */
 
 const struct dev_pm_ops stmmac_pltfr_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(stmmac_pltfr_suspend, stmmac_pltfr_resume)
-- 
2.17.1