Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-discard-pm_runtime_put-return-value'
Rafael J. Wysocki says:
====================
net: Discard pm_runtime_put() return value
This is mostly was a resend of patches [10-12/23] from:
https://lore.kernel.org/linux-pm/6245770.lOV4Wx5bFT@rafael.j.wysocki/
as requested by Jakub, except for the last patch that has been fixed
while at it and so the version has been bumped up.
The patches are independent of each other and they are all requisite
for converting pm_runtime_put() into a void function.
====================
Link: https://patch.msgid.link/2816529.mvXUDI8C0e@rafael.j.wysocki
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+10
-15
+3
-1
drivers/net/ethernet/cadence/macb_main.c
+3
-1
drivers/net/ethernet/cadence/macb_main.c
+1
-4
drivers/net/ethernet/ti/am65-cpsw-ethtool.c
+1
-4
drivers/net/ethernet/ti/am65-cpsw-ethtool.c
···
391
391
static void am65_cpsw_ethtool_op_complete(struct net_device *ndev)
392
392
{
393
393
struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
394
-
int ret;
395
394
396
-
ret = pm_runtime_put(common->dev);
397
-
if (ret < 0 && ret != -EBUSY)
398
-
dev_err(common->dev, "ethtool complete failed %d\n", ret);
395
+
pm_runtime_put(common->dev);
399
396
}
400
397
401
398
static void am65_cpsw_get_drvinfo(struct net_device *ndev,
+1
-4
drivers/net/ethernet/ti/cpsw_ethtool.c
+1
-4
drivers/net/ethernet/ti/cpsw_ethtool.c
···
374
374
void cpsw_ethtool_op_complete(struct net_device *ndev)
375
375
{
376
376
struct cpsw_priv *priv = netdev_priv(ndev);
377
-
int ret;
378
377
379
-
ret = pm_runtime_put(priv->cpsw->dev);
380
-
if (ret < 0)
381
-
cpsw_err(priv, drv, "ethtool complete failed %d\n", ret);
378
+
pm_runtime_put(priv->cpsw->dev);
382
379
}
383
380
384
381
void cpsw_get_channels(struct net_device *ndev, struct ethtool_channels *ch)
+3
-3
drivers/net/wan/framer/framer-core.c
+3
-3
drivers/net/wan/framer/framer-core.c
···
60
60
}
61
61
EXPORT_SYMBOL_GPL(framer_pm_runtime_get_sync);
62
62
63
-
int framer_pm_runtime_put(struct framer *framer)
63
+
void framer_pm_runtime_put(struct framer *framer)
64
64
{
65
65
if (!pm_runtime_enabled(&framer->dev))
66
-
return -EOPNOTSUPP;
66
+
return;
67
67
68
-
return pm_runtime_put(&framer->dev);
68
+
pm_runtime_put(&framer->dev);
69
69
}
70
70
EXPORT_SYMBOL_GPL(framer_pm_runtime_put);
71
71
+2
-3
include/linux/framer/framer.h
+2
-3
include/linux/framer/framer.h
···
96
96
#if IS_ENABLED(CONFIG_GENERIC_FRAMER)
97
97
int framer_pm_runtime_get(struct framer *framer);
98
98
int framer_pm_runtime_get_sync(struct framer *framer);
99
-
int framer_pm_runtime_put(struct framer *framer);
99
+
void framer_pm_runtime_put(struct framer *framer);
100
100
int framer_pm_runtime_put_sync(struct framer *framer);
101
101
int framer_init(struct framer *framer);
102
102
int framer_exit(struct framer *framer);
···
124
124
return -ENOSYS;
125
125
}
126
126
127
-
static inline int framer_pm_runtime_put(struct framer *framer)
127
+
static inline void framer_pm_runtime_put(struct framer *framer)
128
128
{
129
-
return -ENOSYS;
130
129
}
131
130
132
131
static inline int framer_pm_runtime_put_sync(struct framer *framer)