* [RFC PATCH 01/15] delay: rename fsleep to usleep_autoyield
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 02/15] base: regmap: use new name 'usleep_autoyield' instead of 'fsleep' Wolfram Sang
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
Rename fsleep because the current name breaks the pattern of the first
letter being a unit (and it is not 'femto' here). Let's add the proper
unit again and add a suffix to the function which will hopefully be a
bit more explanatory. To give some time until all users are converted,
introduce a fallback define which will go away later.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
Documentation/timers/timers-howto.rst | 2 +-
include/linux/delay.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/timers/timers-howto.rst b/Documentation/timers/timers-howto.rst
index 5c169e3d29a8..d0a57ca5e18e 100644
--- a/Documentation/timers/timers-howto.rst
+++ b/Documentation/timers/timers-howto.rst
@@ -112,4 +112,4 @@ NON-ATOMIC CONTEXT:
you know you have a need for the interruptible variant.
FLEXIBLE SLEEPING (any delay, uninterruptible)
- * Use fsleep
+ * Use usleep_autoyield
diff --git a/include/linux/delay.h b/include/linux/delay.h
index 039e7e0c7378..d0919f52fec8 100644
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -78,7 +78,7 @@ static inline void ssleep(unsigned int seconds)
}
/* see Documentation/timers/timers-howto.rst for the thresholds */
-static inline void fsleep(unsigned long usecs)
+static inline void usleep_autoyield(unsigned long usecs)
{
if (usecs <= 10)
udelay(usecs);
@@ -88,4 +88,6 @@ static inline void fsleep(unsigned long usecs)
msleep(DIV_ROUND_UP(usecs, 1000));
}
+#define fsleep usleep_autoyield
+
#endif /* defined(_LINUX_DELAY_H) */
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 02/15] base: regmap: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 01/15] delay: rename fsleep to usleep_autoyield Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 03/15] bus: mhi: core: " Wolfram Sang
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/base/regmap/regmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 8f9fe5fd4707..27c75611d177 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2429,7 +2429,7 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map,
if (regs[i].delay_us) {
if (map->can_sleep)
- fsleep(regs[i].delay_us);
+ usleep_autoyield(regs[i].delay_us);
else
udelay(regs[i].delay_us);
}
@@ -2470,7 +2470,7 @@ static int _regmap_multi_reg_write(struct regmap *map,
if (regs[i].delay_us) {
if (map->can_sleep)
- fsleep(regs[i].delay_us);
+ usleep_autoyield(regs[i].delay_us);
else
udelay(regs[i].delay_us);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 03/15] bus: mhi: core: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 01/15] delay: rename fsleep to usleep_autoyield Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 02/15] base: regmap: use new name 'usleep_autoyield' instead of 'fsleep' Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 04/15] iio: adc: " Wolfram Sang
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/bus/mhi/core/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index ffde617f93a3..2a8d724e1445 100644
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -54,7 +54,7 @@ int __must_check mhi_poll_reg_field(struct mhi_controller *mhi_cntrl,
if (out == val)
return 0;
- fsleep(delayus);
+ usleep_autoyield(delayus);
}
return -ETIMEDOUT;
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 04/15] iio: adc: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (2 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 03/15] bus: mhi: core: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 05/15] memory: tegra: " Wolfram Sang
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/iio/adc/ti-tsc2046.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c
index e8fc4d01f30b..d0d041ec632a 100644
--- a/drivers/iio/adc/ti-tsc2046.c
+++ b/drivers/iio/adc/ti-tsc2046.c
@@ -464,7 +464,7 @@ static void tsc2046_adc_reenable_trigger(struct iio_trigger *trig)
*/
delta = priv->scan_interval_us - priv->time_per_scan_us;
if (delta > 0)
- fsleep(delta);
+ usleep_autoyield(delta);
spin_lock_irqsave(&priv->trig_lock, flags);
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 05/15] memory: tegra: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (3 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 04/15] iio: adc: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 06/15] mfd: " Wolfram Sang
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/memory/tegra/tegra20.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/memory/tegra/tegra20.c b/drivers/memory/tegra/tegra20.c
index fcd7738fcb53..29ec45e79edf 100644
--- a/drivers/memory/tegra/tegra20.c
+++ b/drivers/memory/tegra/tegra20.c
@@ -463,7 +463,7 @@ static void tegra20_mc_stat_gather(struct tegra20_mc_stat *stat)
mc_writel(mc, 0xffffffff, MC_STAT_EMC_CLOCK_LIMIT);
mc_writel(mc, EMC_GATHER_ENABLE, MC_STAT_CONTROL);
- fsleep(stat->sample_time_usec);
+ usleep_autoyield(stat->sample_time_usec);
mc_writel(mc, EMC_GATHER_DISABLE, MC_STAT_CONTROL);
count0 = mc_readl(mc, MC_STAT_EMC_COUNT_0);
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 06/15] mfd: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (4 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 05/15] memory: tegra: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 07/15] mux: " Wolfram Sang
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/mfd/acer-ec-a500.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/acer-ec-a500.c b/drivers/mfd/acer-ec-a500.c
index 80c2fdd14fc4..b3155c7b0559 100644
--- a/drivers/mfd/acer-ec-a500.c
+++ b/drivers/mfd/acer-ec-a500.c
@@ -59,7 +59,7 @@ static int a500_ec_read(void *context, const void *reg_buf, size_t reg_size,
*ret_val = ret;
if (reg == REG_CURRENT_NOW)
- fsleep(10000);
+ usleep_autoyield(10000);
return 0;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 07/15] mux: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (5 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 06/15] mfd: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 08/15] net: ethernet: realtek: " Wolfram Sang
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/mux/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mux/core.c b/drivers/mux/core.c
index 22f4709768d1..4999f255b787 100644
--- a/drivers/mux/core.c
+++ b/drivers/mux/core.c
@@ -329,7 +329,7 @@ static void mux_control_delay(struct mux_control *mux, unsigned int delay_us)
delayend = ktime_add_us(mux->last_change, delay_us);
remaining = ktime_us_delta(delayend, ktime_get());
if (remaining > 0)
- fsleep(remaining);
+ usleep_autoyield(remaining);
}
/**
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 08/15] net: ethernet: realtek: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (6 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 07/15] mux: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 09/15] net: mdio: " Wolfram Sang
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/net/ethernet/realtek/r8169_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 19e2621e0645..ec39b5b98cfb 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -727,7 +727,7 @@ static bool rtl_loop_wait(struct rtl8169_private *tp, const struct rtl_cond *c,
for (i = 0; i < n; i++) {
if (c->check(tp) == high)
return true;
- fsleep(usecs);
+ usleep_autoyield(usecs);
}
if (net_ratelimit())
@@ -2468,7 +2468,7 @@ static void rtl_wait_txrx_fifo_empty(struct rtl8169_private *tp)
static void rtl_enable_rxdvgate(struct rtl8169_private *tp)
{
RTL_W32(tp, MISC, RTL_R32(tp, MISC) | RXDV_GATED_EN);
- fsleep(2000);
+ usleep_autoyield(2000);
rtl_wait_txrx_fifo_empty(tp);
}
@@ -3972,11 +3972,11 @@ static void rtl8169_cleanup(struct rtl8169_private *tp, bool going_down)
break;
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_63:
rtl_enable_rxdvgate(tp);
- fsleep(2000);
+ usleep_autoyield(2000);
break;
default:
RTL_W8(tp, ChipCmd, RTL_R8(tp, ChipCmd) | StopReq);
- fsleep(100);
+ usleep_autoyield(100);
break;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 09/15] net: mdio: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (7 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 08/15] net: ethernet: realtek: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 10/15] net: phy: " Wolfram Sang
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/net/mdio/mdio-ipq4019.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mdio/mdio-ipq4019.c b/drivers/net/mdio/mdio-ipq4019.c
index 4eba5a91075c..6e7de2e82e3a 100644
--- a/drivers/net/mdio/mdio-ipq4019.c
+++ b/drivers/net/mdio/mdio-ipq4019.c
@@ -192,7 +192,7 @@ static int ipq_mdio_reset(struct mii_bus *bus)
val = readl(priv->eth_ldo_rdy);
val |= BIT(0);
writel(val, priv->eth_ldo_rdy);
- fsleep(IPQ_PHY_SET_DELAY_US);
+ usleep_autoyield(IPQ_PHY_SET_DELAY_US);
}
/* Configure MDIO clock source frequency if clock is specified in the device tree */
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 10/15] net: phy: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (8 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 09/15] net: mdio: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 11/15] net: wireless: realtek: rtw88: " Wolfram Sang
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/net/phy/broadcom.c | 2 +-
drivers/net/phy/mdio_bus.c | 4 ++--
drivers/net/phy/mdio_device.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 3c683e0e40e9..26a8665ab245 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -446,7 +446,7 @@ static int bcm54xx_resume(struct phy_device *phydev)
/* Upon exiting power down, the PHY remains in an internal reset state
* for 40us
*/
- fsleep(40);
+ usleep_autoyield(40);
/* Issue a soft reset after clearing the power down bit
* and before doing any other configuration.
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 58d602985877..dfd4c2e1e1e3 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -570,10 +570,10 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
return err;
} else if (gpiod) {
bus->reset_gpiod = gpiod;
- fsleep(bus->reset_delay_us);
+ usleep_autoyield(bus->reset_delay_us);
gpiod_set_value_cansleep(gpiod, 0);
if (bus->reset_post_delay_us > 0)
- fsleep(bus->reset_post_delay_us);
+ usleep_autoyield(bus->reset_post_delay_us);
}
if (bus->reset) {
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 250742ffdfd9..9941a38c3631 100644
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -132,7 +132,7 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
if (d)
- fsleep(d);
+ usleep_autoyield(d);
}
EXPORT_SYMBOL(mdio_device_reset);
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 11/15] net: wireless: realtek: rtw88: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (9 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 10/15] net: phy: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 12/15] net: wireless: realtek: rtw89: " Wolfram Sang
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/net/wireless/realtek/rtw88/rtw8822c.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
index 35c46e5209de..01e934c7b97f 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
@@ -1476,12 +1476,12 @@ static void rtw8822c_txgapk_read_offset(struct rtw_dev *rtwdev, u8 path)
rtw_write32_mask(rtwdev, REG_IQKSTAT, MASKBYTE0, 0x0);
rtw_write32_mask(rtwdev, REG_TX_TONE_IDX, MASKBYTE0, 0x018);
- fsleep(1000);
+ usleep_autoyield(1000);
if (channel >= 1 && channel <= 14)
rtw_write32_mask(rtwdev, REG_R_CONFIG, MASKBYTE0, BIT_2G_SWING);
else
rtw_write32_mask(rtwdev, REG_R_CONFIG, MASKBYTE0, BIT_5G_SWING);
- fsleep(1000);
+ usleep_autoyield(1000);
rtw_write32_mask(rtwdev, REG_NCTL0, MASKDWORD, cfg1_1b00[path]);
rtw_write32_mask(rtwdev, REG_NCTL0, MASKDWORD, cfg2_1b00[path]);
@@ -2905,7 +2905,7 @@ static void rtw8822c_do_lck(struct rtw_dev *rtwdev)
rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_CTRL, RFREG_MASK, 0x80010);
rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_PFD, RFREG_MASK, 0x1F0FA);
- fsleep(1);
+ usleep_autoyield(1);
rtw_write_rf(rtwdev, RF_PATH_A, RF_AAC_CTRL, RFREG_MASK, 0x80000);
rtw_write_rf(rtwdev, RF_PATH_A, RF_SYN_AAC, RFREG_MASK, 0x80001);
read_poll_timeout(rtw_read_rf, val, val != 0x1, 1000, 100000,
@@ -2915,7 +2915,7 @@ static void rtw8822c_do_lck(struct rtw_dev *rtwdev)
rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x0f000);
rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x4f000);
- fsleep(1);
+ usleep_autoyield(1);
rtw_write_rf(rtwdev, RF_PATH_A, RF_FAST_LCK, RFREG_MASK, 0x0f000);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 12/15] net: wireless: realtek: rtw89: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (10 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 11/15] net: wireless: realtek: rtw88: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 13/15] thermal: tegra: " Wolfram Sang
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/net/wireless/realtek/rtw89/fw.c | 2 +-
drivers/net/wireless/realtek/rtw89/mac.c | 6 +++---
drivers/net/wireless/realtek/rtw89/pci.c | 2 +-
drivers/net/wireless/realtek/rtw89/rtw8852a.c | 4 ++--
drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c
index 8a57b75b07c0..a357756cf3a5 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.c
+++ b/drivers/net/wireless/realtek/rtw89/fw.c
@@ -396,7 +396,7 @@ static void rtw89_fw_prog_cnt_dump(struct rtw89_dev *rtwdev)
for (index = 0; index < 15; index++) {
val32 = rtw89_read32(rtwdev, R_AX_DBG_PORT_SEL);
rtw89_err(rtwdev, "[ERR]fw PC = 0x%x\n", val32);
- fsleep(10);
+ usleep_autoyield(10);
}
}
diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index b98c47e9ecfe..5fe7e2b9f5f7 100644
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -867,7 +867,7 @@ static int rtw89_mac_sub_pwr_seq(struct rtw89_dev *rtwdev, u8 cv_msk,
if (cur_cfg->val == PWR_DELAY_US)
udelay(cur_cfg->addr);
else
- fsleep(cur_cfg->addr * 1000);
+ usleep_autoyield(cur_cfg->addr * 1000);
break;
default:
return -EINVAL;
@@ -3042,7 +3042,7 @@ int rtw89_mac_port_update(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif)
rtw89_mac_port_cfg_mbssid(rtwdev, rtwvif);
rtw89_mac_port_cfg_hiq_drop(rtwdev, rtwvif);
rtw89_mac_port_cfg_func_en(rtwdev, rtwvif);
- fsleep(BCN_ERLY_SET_DLY);
+ usleep_autoyield(BCN_ERLY_SET_DLY);
rtw89_mac_port_cfg_bcn_early(rtwdev, rtwvif);
return 0;
@@ -3425,7 +3425,7 @@ void rtw89_mac_cfg_sb(struct rtw89_dev *rtwdev, u32 val)
FIELD_PREP(B_MAC_AX_SB_DRV_MASK, val) |
FIELD_PREP(B_MAC_AX_SB_FW_MASK, fw_sb);
rtw89_write32(rtwdev, R_AX_SCOREBOARD, val);
- fsleep(1000); /* avoid BT FW loss information */
+ usleep_autoyield(1000); /* avoid BT FW loss information */
}
u32 rtw89_mac_get_sb(struct rtw89_dev *rtwdev)
diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 2c94762e4f93..9ab17bcfe8e0 100644
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -1509,7 +1509,7 @@ __get_target(struct rtw89_dev *rtwdev, u16 *target, enum rtw89_pcie_phy phy_rate
if (ret)
return ret;
- fsleep(300);
+ usleep_autoyield(300);
ret = rtw89_read16_mdio(rtwdev, RAC_CTRL_PPR_V1, phy_rate, &tar);
if (ret)
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 6b75e4bc7352..3e369644680b 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -1139,7 +1139,7 @@ static void rtw8852a_set_channel_help(struct rtw89_dev *rtwdev, bool enter,
rtw8852a_dfs_en(rtwdev, false);
rtw8852a_tssi_cont_en_phyidx(rtwdev, false, RTW89_PHY_0);
rtw8852a_adc_en(rtwdev, false);
- fsleep(40);
+ usleep_autoyield(40);
rtw8852a_bb_reset_en(rtwdev, phy_idx, false);
} else {
rtw89_mac_cfg_ppdu_status(rtwdev, RTW89_MAC_0, true);
@@ -1635,7 +1635,7 @@ static u8 rtw8852a_get_thermal(struct rtw89_dev *rtwdev, enum rtw89_rf_path rf_p
rtw89_write_rf(rtwdev, rf_path, RR_TM, RR_TM_TRI, 0x0);
rtw89_write_rf(rtwdev, rf_path, RR_TM, RR_TM_TRI, 0x1);
- fsleep(200);
+ usleep_autoyield(200);
return (u8)rtw89_read_rf(rtwdev, rf_path, RR_TM, RR_TM_VAL);
}
diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c b/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c
index c021e93eb07b..818719935e59 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c
@@ -836,7 +836,7 @@ static void _iqk_rxk_setting(struct rtw89_dev *rtwdev, u8 path)
rtw89_write_rf(rtwdev, path, RR_RXKPLL, RR_RXKPLL_OFF, 0x13);
rtw89_write_rf(rtwdev, path, RR_RXKPLL, RR_RXKPLL_POW, 0x0);
rtw89_write_rf(rtwdev, path, RR_RXKPLL, RR_RXKPLL_POW, 0x1);
- fsleep(128);
+ usleep_autoyield(128);
}
static bool _iqk_check_cal(struct rtw89_dev *rtwdev, u8 path, u8 ktype)
@@ -1272,7 +1272,7 @@ static bool _iqk_lok(struct rtw89_dev *rtwdev,
rtw89_phy_write32_mask(rtwdev, R_KIP_IQP + (path << 8), MASKDWORD, itqt);
tmp = _iqk_one_shot(rtwdev, phy_idx, path, ID_FLOK_COARSE);
iqk_info->lok_cor_fail[0][path] = tmp;
- fsleep(10);
+ usleep_autoyield(10);
rtw89_phy_write32_mask(rtwdev, R_KIP_IQP + (path << 8), MASKDWORD, itqt);
tmp = _iqk_one_shot(rtwdev, phy_idx, path, ID_FLOK_FINE);
iqk_info->lok_fin_fail[0][path] = tmp;
@@ -1777,7 +1777,7 @@ static void _set_rx_dck(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy,
rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_LV, 0x0);
rtw89_write_rf(rtwdev, path, RR_DCK, RR_DCK_LV, 0x1);
- fsleep(600);
+ usleep_autoyield(600);
rtw89_btc_ntfy_wl_rfk(rtwdev, phy_map, BTC_WRFKT_RXDCK, BTC_WRFK_ONESHOT_STOP);
@@ -2072,7 +2072,7 @@ static void _dpk_lbk_rxiqk(struct rtw89_dev *rtwdev,
rtw89_write_rf(rtwdev, path, RR_RXKPLL, RR_RXKPLL_POW, 0x0);
rtw89_write_rf(rtwdev, path, RR_RXKPLL, RR_RXKPLL_POW, 0x1);
- fsleep(70);
+ usleep_autoyield(70);
rtw89_write_rf(rtwdev, path, RR_RXIQGEN, RR_RXIQGEN_ATTL, 0x1f);
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 13/15] thermal: tegra: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (11 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 12/15] net: wireless: realtek: rtw89: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 14/15] usb: chipidea: " Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 15/15] delay: remove the fallback for fsleep Wolfram Sang
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/thermal/tegra/tegra30-tsensor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/tegra/tegra30-tsensor.c b/drivers/thermal/tegra/tegra30-tsensor.c
index 9b6b693cbcf8..705981f74a8d 100644
--- a/drivers/thermal/tegra/tegra30-tsensor.c
+++ b/drivers/thermal/tegra/tegra30-tsensor.c
@@ -105,7 +105,7 @@ static int tegra_tsensor_hw_enable(const struct tegra_tsensor *ts)
return err;
}
- fsleep(1000);
+ usleep_autoyield(1000);
err = reset_control_deassert(ts->rst);
if (err) {
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 14/15] usb: chipidea: use new name 'usleep_autoyield' instead of 'fsleep'
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (12 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 13/15] thermal: tegra: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
2022-03-21 16:12 ` [RFC PATCH 15/15] delay: remove the fallback for fsleep Wolfram Sang
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
The function was just renamed to be easier understandable. No functional
change.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
drivers/usb/chipidea/ci_hdrc_tegra.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
index a72a9474afea..767f13abfe91 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
@@ -189,13 +189,13 @@ static int tegra_usb_internal_port_reset(struct ehci_hcd *ehci,
temp = ehci_readl(ehci, portsc_reg);
temp |= PORT_RESET;
ehci_writel(ehci, temp, portsc_reg);
- fsleep(10000);
+ usleep_autoyield(10000);
temp &= ~PORT_RESET;
ehci_writel(ehci, temp, portsc_reg);
- fsleep(1000);
+ usleep_autoyield(1000);
tries = 100;
do {
- fsleep(1000);
+ usleep_autoyield(1000);
/*
* Up to this point, Port Enable bit is
* expected to be set after 2 ms waiting.
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [RFC PATCH 15/15] delay: remove the fallback for fsleep
2022-03-21 16:12 [RFC PATCH 00/15] treewide: rename fsleep Wolfram Sang
` (13 preceding siblings ...)
2022-03-21 16:12 ` [RFC PATCH 14/15] usb: chipidea: " Wolfram Sang
@ 2022-03-21 16:12 ` Wolfram Sang
14 siblings, 0 replies; 16+ messages in thread
From: Wolfram Sang @ 2022-03-21 16:12 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-renesas-soc, Heiner Kallweit, Wolfram Sang
All users are converted to usleep_autoyield now.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
RFC, please do not apply yet
include/linux/delay.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/delay.h b/include/linux/delay.h
index d0919f52fec8..f1bf8d4103c0 100644
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -88,6 +88,4 @@ static inline void usleep_autoyield(unsigned long usecs)
msleep(DIV_ROUND_UP(usecs, 1000));
}
-#define fsleep usleep_autoyield
-
#endif /* defined(_LINUX_DELAY_H) */
--
2.34.1
^ permalink raw reply related [flat|nested] 16+ messages in thread