Created
March 25, 2023 02:39
-
-
Save glitsj16/b082da47c46ef9f3cb444798b32b35f7 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 4171f827d0e1f7c223139c77d7ba77dc7b516edb Mon Sep 17 00:00:00 2001 | |
From: graysky <therealgraysky@proton.me> | |
Date: Wed, 5 Oct 2022 05:43:13 -0400 | |
Subject: [PATCH 4/8] hrtimer: Replace all schedule timeout(1) with | |
schedule_min_hrtimeout() | |
--- | |
drivers/accessibility/speakup/speakup_acntpc.c | 4 ++-- | |
drivers/accessibility/speakup/speakup_apollo.c | 2 +- | |
drivers/accessibility/speakup/speakup_decext.c | 2 +- | |
drivers/accessibility/speakup/speakup_decpc.c | 2 +- | |
drivers/accessibility/speakup/speakup_dectlk.c | 2 +- | |
drivers/accessibility/speakup/speakup_dtlk.c | 4 ++-- | |
drivers/accessibility/speakup/speakup_keypc.c | 4 ++-- | |
drivers/accessibility/speakup/synth.c | 14 ++++---------- | |
drivers/block/swim.c | 5 +++-- | |
drivers/char/ipmi/ipmi_msghandler.c | 2 +- | |
drivers/char/ipmi/ipmi_ssif.c | 2 +- | |
drivers/comedi/drivers/ni_mio_common.c | 2 +- | |
drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 2 +- | |
drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- | |
drivers/media/pci/ivtv/ivtv-streams.c | 2 +- | |
drivers/mfd/ucb1x00-core.c | 2 +- | |
drivers/misc/sgi-xp/xpc_channel.c | 2 +- | |
drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- | |
drivers/net/usb/lan78xx.c | 2 +- | |
drivers/net/usb/usbnet.c | 2 +- | |
drivers/scsi/fnic/fnic_scsi.c | 4 ++-- | |
drivers/scsi/snic/snic_scsi.c | 2 +- | |
drivers/staging/rts5208/rtsx.c | 2 +- | |
drivers/video/fbdev/omap/hwa742.c | 2 +- | |
drivers/video/fbdev/pxafb.c | 2 +- | |
fs/btrfs/delalloc-space.c | 2 +- | |
sound/usb/line6/pcm.c | 2 +- | |
27 files changed, 36 insertions(+), 41 deletions(-) | |
diff --git a/drivers/accessibility/speakup/speakup_acntpc.c b/drivers/accessibility/speakup/speakup_acntpc.c | |
index a55b60754eb1..91b4d362ac60 100644 | |
--- a/drivers/accessibility/speakup/speakup_acntpc.c | |
+++ b/drivers/accessibility/speakup/speakup_acntpc.c | |
@@ -198,7 +198,7 @@ static void do_catch_up(struct spk_synth *synth) | |
full_time_val = full_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
if (synth_full()) { | |
- schedule_timeout(msecs_to_jiffies(full_time_val)); | |
+ schedule_msec_hrtimeout((full_time_val)); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
@@ -226,7 +226,7 @@ static void do_catch_up(struct spk_synth *synth) | |
jiffy_delta_val = jiffy_delta->u.n.value; | |
delay_time_val = delay_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout(delay_time_val); | |
jiff_max = jiffies + jiffy_delta_val; | |
} | |
} | |
diff --git a/drivers/accessibility/speakup/speakup_apollo.c b/drivers/accessibility/speakup/speakup_apollo.c | |
index c84a7e0864b7..b7be255a991e 100644 | |
--- a/drivers/accessibility/speakup/speakup_apollo.c | |
+++ b/drivers/accessibility/speakup/speakup_apollo.c | |
@@ -165,7 +165,7 @@ static void do_catch_up(struct spk_synth *synth) | |
if (!synth->io_ops->synth_out(synth, ch)) { | |
synth->io_ops->tiocmset(synth, 0, UART_MCR_RTS); | |
synth->io_ops->tiocmset(synth, UART_MCR_RTS, 0); | |
- schedule_timeout(msecs_to_jiffies(full_time_val)); | |
+ schedule_msec_hrtimeout(full_time_val); | |
continue; | |
} | |
if (time_after_eq(jiffies, jiff_max) && (ch == SPACE)) { | |
diff --git a/drivers/accessibility/speakup/speakup_decext.c b/drivers/accessibility/speakup/speakup_decext.c | |
index eaebf62300a4..37d599395159 100644 | |
--- a/drivers/accessibility/speakup/speakup_decext.c | |
+++ b/drivers/accessibility/speakup/speakup_decext.c | |
@@ -180,7 +180,7 @@ static void do_catch_up(struct spk_synth *synth) | |
if (ch == '\n') | |
ch = 0x0D; | |
if (synth_full() || !synth->io_ops->synth_out(synth, ch)) { | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout(delay_time_val); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
diff --git a/drivers/accessibility/speakup/speakup_decpc.c b/drivers/accessibility/speakup/speakup_decpc.c | |
index dec314dee214..2a5deb5256b2 100644 | |
--- a/drivers/accessibility/speakup/speakup_decpc.c | |
+++ b/drivers/accessibility/speakup/speakup_decpc.c | |
@@ -398,7 +398,7 @@ static void do_catch_up(struct spk_synth *synth) | |
if (ch == '\n') | |
ch = 0x0D; | |
if (dt_sendchar(ch)) { | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout((delay_time_val)); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
diff --git a/drivers/accessibility/speakup/speakup_dectlk.c b/drivers/accessibility/speakup/speakup_dectlk.c | |
index 2a7e8d727904..35c0b62f5351 100644 | |
--- a/drivers/accessibility/speakup/speakup_dectlk.c | |
+++ b/drivers/accessibility/speakup/speakup_dectlk.c | |
@@ -257,7 +257,7 @@ static void do_catch_up(struct spk_synth *synth) | |
if (ch == '\n') | |
ch = 0x0D; | |
if (synth_full_val || !synth->io_ops->synth_out(synth, ch)) { | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout(delay_time_val); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
diff --git a/drivers/accessibility/speakup/speakup_dtlk.c b/drivers/accessibility/speakup/speakup_dtlk.c | |
index 6f01e010aaf4..c4c4413b38b4 100644 | |
--- a/drivers/accessibility/speakup/speakup_dtlk.c | |
+++ b/drivers/accessibility/speakup/speakup_dtlk.c | |
@@ -211,7 +211,7 @@ static void do_catch_up(struct spk_synth *synth) | |
delay_time_val = delay_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
if (synth_full()) { | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout((delay_time_val)); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
@@ -227,7 +227,7 @@ static void do_catch_up(struct spk_synth *synth) | |
delay_time_val = delay_time->u.n.value; | |
jiffy_delta_val = jiffy_delta->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout((delay_time_val)); | |
jiff_max = jiffies + jiffy_delta_val; | |
} | |
} | |
diff --git a/drivers/accessibility/speakup/speakup_keypc.c b/drivers/accessibility/speakup/speakup_keypc.c | |
index f61b62f1ea4d..9b0e072223eb 100644 | |
--- a/drivers/accessibility/speakup/speakup_keypc.c | |
+++ b/drivers/accessibility/speakup/speakup_keypc.c | |
@@ -199,7 +199,7 @@ static void do_catch_up(struct spk_synth *synth) | |
full_time_val = full_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
if (synth_full()) { | |
- schedule_timeout(msecs_to_jiffies(full_time_val)); | |
+ schedule_msec_hrtimeout((full_time_val)); | |
continue; | |
} | |
set_current_state(TASK_RUNNING); | |
@@ -232,7 +232,7 @@ static void do_catch_up(struct spk_synth *synth) | |
jiffy_delta_val = jiffy_delta->u.n.value; | |
delay_time_val = delay_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
- schedule_timeout(msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout(delay_time_val); | |
jiff_max = jiffies + jiffy_delta_val; | |
} | |
} | |
diff --git a/drivers/accessibility/speakup/synth.c b/drivers/accessibility/speakup/synth.c | |
index eea2a2fa4f01..493ea4d5e70b 100644 | |
--- a/drivers/accessibility/speakup/synth.c | |
+++ b/drivers/accessibility/speakup/synth.c | |
@@ -93,12 +93,8 @@ static void _spk_do_catch_up(struct spk_synth *synth, int unicode) | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
if (ch == '\n') | |
ch = synth->procspeech; | |
- if (unicode) | |
- ret = synth->io_ops->synth_out_unicode(synth, ch); | |
- else | |
- ret = synth->io_ops->synth_out(synth, ch); | |
- if (!ret) { | |
- schedule_timeout(msecs_to_jiffies(full_time_val)); | |
+ if (!synth->io_ops->synth_out(synth, ch)) { | |
+ schedule_msec_hrtimeout(full_time_val); | |
continue; | |
} | |
if (time_after_eq(jiffies, jiff_max) && (ch == SPACE)) { | |
@@ -108,11 +104,9 @@ static void _spk_do_catch_up(struct spk_synth *synth, int unicode) | |
full_time_val = full_time->u.n.value; | |
spin_unlock_irqrestore(&speakup_info.spinlock, flags); | |
if (synth->io_ops->synth_out(synth, synth->procspeech)) | |
- schedule_timeout( | |
- msecs_to_jiffies(delay_time_val)); | |
+ schedule_msec_hrtimeout(delay_time_val); | |
else | |
- schedule_timeout( | |
- msecs_to_jiffies(full_time_val)); | |
+ schedule_msec_hrtimeout(full_time_val); | |
jiff_max = jiffies + jiffy_delta_val; | |
} | |
set_current_state(TASK_RUNNING); | |
diff --git a/drivers/block/swim.c b/drivers/block/swim.c | |
index 42b4b6828690..9d16e9ed6d1e 100644 | |
--- a/drivers/block/swim.c | |
+++ b/drivers/block/swim.c | |
@@ -330,7 +330,7 @@ static inline void swim_motor(struct swim __iomem *base, | |
if (swim_readbit(base, MOTOR_ON)) | |
break; | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} | |
} else if (action == OFF) { | |
swim_action(base, MOTOR_OFF); | |
@@ -349,7 +349,7 @@ static inline void swim_eject(struct swim __iomem *base) | |
if (!swim_readbit(base, DISK_IN)) | |
break; | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} | |
swim_select(base, RELAX); | |
} | |
@@ -374,6 +374,7 @@ static inline int swim_step(struct swim __iomem *base) | |
set_current_state(TASK_INTERRUPTIBLE); | |
schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
swim_select(base, RELAX); | |
if (!swim_readbit(base, STEP)) | |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c | |
index 49a1707693c9..b48e9dbbfc6e 100644 | |
--- a/drivers/char/ipmi/ipmi_msghandler.c | |
+++ b/drivers/char/ipmi/ipmi_msghandler.c | |
@@ -3728,7 +3728,7 @@ static void cleanup_smi_msgs(struct ipmi_smi *intf) | |
/* Current message first, to preserve order */ | |
while (intf->curr_msg && !list_empty(&intf->waiting_rcv_msgs)) { | |
/* Wait for the message to clear out. */ | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} | |
/* No need for locks, the interface is down. */ | |
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c | |
index e1072809fe31..7dd681f62578 100644 | |
--- a/drivers/char/ipmi/ipmi_ssif.c | |
+++ b/drivers/char/ipmi/ipmi_ssif.c | |
@@ -1270,7 +1270,7 @@ static void shutdown_ssif(void *send_info) | |
/* make sure the driver is not looking for flags any more. */ | |
while (ssif_info->ssif_state != SSIF_IDLE) | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
ssif_info->stopping = true; | |
del_timer_sync(&ssif_info->watch_timer); | |
diff --git a/drivers/comedi/drivers/ni_mio_common.c b/drivers/comedi/drivers/ni_mio_common.c | |
index d39998565808..7c7d6844b074 100644 | |
--- a/drivers/comedi/drivers/ni_mio_common.c | |
+++ b/drivers/comedi/drivers/ni_mio_common.c | |
@@ -4747,7 +4747,7 @@ static int cs5529_wait_for_idle(struct comedi_device *dev) | |
if ((status & NI67XX_CAL_STATUS_BUSY) == 0) | |
break; | |
set_current_state(TASK_INTERRUPTIBLE); | |
- if (schedule_timeout(1)) | |
+ if (schedule_min_hrtimeout()) | |
return -EIO; | |
} | |
if (i == timeout) { | |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | |
index 086e69a130d4..115b71cb0002 100644 | |
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | |
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | |
@@ -209,7 +209,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv, | |
break; | |
} | |
if (lazy) | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
else if ((++count & 0x0F) == 0) { | |
/** | |
* FIXME: Use schedule_hr_timeout here for | |
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c | |
index 7947dcd615e8..fb7bdfa7d7a8 100644 | |
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c | |
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c | |
@@ -1133,7 +1133,7 @@ void ivtv_s_std_dec(struct ivtv *itv, v4l2_std_id std) | |
TASK_UNINTERRUPTIBLE); | |
if ((read_reg(IVTV_REG_DEC_LINE_FIELD) >> 16) < 100) | |
break; | |
- schedule_timeout(msecs_to_jiffies(25)); | |
+ schedule_msec_hrtimeout((25)); | |
} | |
finish_wait(&itv->vsync_waitq, &wait); | |
mutex_lock(&itv->serialize_lock); | |
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c | |
index 13d7d55e6594..280686cb37f4 100644 | |
--- a/drivers/media/pci/ivtv/ivtv-streams.c | |
+++ b/drivers/media/pci/ivtv/ivtv-streams.c | |
@@ -846,7 +846,7 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end) | |
while (!test_bit(IVTV_F_I_EOS, &itv->i_flags) && | |
time_before(jiffies, | |
then + msecs_to_jiffies(2000))) { | |
- schedule_timeout(msecs_to_jiffies(10)); | |
+ schedule_msec_hrtimeout((10)); | |
} | |
/* To convert jiffies to ms, we must multiply by 1000 | |
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c | |
index b690796d24d4..448b13da62b4 100644 | |
--- a/drivers/mfd/ucb1x00-core.c | |
+++ b/drivers/mfd/ucb1x00-core.c | |
@@ -250,7 +250,7 @@ unsigned int ucb1x00_adc_read(struct ucb1x00 *ucb, int adc_channel, int sync) | |
break; | |
/* yield to other processes */ | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} | |
return UCB_ADC_DAT(val); | |
diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c | |
index 8e6607fc8a67..b9ab770bbdb5 100644 | |
--- a/drivers/misc/sgi-xp/xpc_channel.c | |
+++ b/drivers/misc/sgi-xp/xpc_channel.c | |
@@ -834,7 +834,7 @@ xpc_allocate_msg_wait(struct xpc_channel *ch) | |
atomic_inc(&ch->n_on_msg_allocate_wq); | |
prepare_to_wait(&ch->msg_allocate_wq, &wait, TASK_INTERRUPTIBLE); | |
- ret = schedule_timeout(1); | |
+ ret = schedule_min_hrtimeout(); | |
finish_wait(&ch->msg_allocate_wq, &wait); | |
atomic_dec(&ch->n_on_msg_allocate_wq); | |
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c | |
index 687dd542f7f6..fcde62700320 100644 | |
--- a/drivers/net/can/usb/peak_usb/pcan_usb.c | |
+++ b/drivers/net/can/usb/peak_usb/pcan_usb.c | |
@@ -307,7 +307,7 @@ static int pcan_usb_write_mode(struct peak_usb_device *dev, u8 onoff) | |
} else { | |
/* the PCAN-USB needs time to init */ | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(msecs_to_jiffies(PCAN_USB_STARTUP_TIMEOUT)); | |
+ schedule_msec_hrtimeout((PCAN_USB_STARTUP_TIMEOUT)); | |
} | |
return err; | |
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c | |
index f18ab8e220db..2f2a35f971a0 100644 | |
--- a/drivers/net/usb/lan78xx.c | |
+++ b/drivers/net/usb/lan78xx.c | |
@@ -3179,7 +3179,7 @@ static void lan78xx_terminate_urbs(struct lan78xx_net *dev) | |
/* maybe wait for deletions to finish. */ | |
while (!skb_queue_empty(&dev->rxq) || | |
!skb_queue_empty(&dev->txq)) { | |
- schedule_timeout(msecs_to_jiffies(UNLINK_TIMEOUT_MS)); | |
+ schedule_msec_hrtimeout((UNLINK_TIMEOUT_MS)); | |
set_current_state(TASK_UNINTERRUPTIBLE); | |
netif_dbg(dev, ifdown, dev->net, | |
"waited for %d urb completions", temp); | |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c | |
index 64a9a80b2309..533ac8bd4cb5 100644 | |
--- a/drivers/net/usb/usbnet.c | |
+++ b/drivers/net/usb/usbnet.c | |
@@ -780,7 +780,7 @@ static void wait_skb_queue_empty(struct sk_buff_head *q) | |
spin_lock_irqsave(&q->lock, flags); | |
while (!skb_queue_empty(q)) { | |
spin_unlock_irqrestore(&q->lock, flags); | |
- schedule_timeout(msecs_to_jiffies(UNLINK_TIMEOUT_MS)); | |
+ schedule_msec_hrtimeout((UNLINK_TIMEOUT_MS)); | |
set_current_state(TASK_UNINTERRUPTIBLE); | |
spin_lock_irqsave(&q->lock, flags); | |
} | |
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c | |
index 26dbd347156e..bed5ca51c4a4 100644 | |
--- a/drivers/scsi/fnic/fnic_scsi.c | |
+++ b/drivers/scsi/fnic/fnic_scsi.c | |
@@ -205,7 +205,7 @@ int fnic_fw_reset_handler(struct fnic *fnic) | |
/* wait for io cmpl */ | |
while (atomic_read(&fnic->in_flight)) | |
- schedule_timeout(msecs_to_jiffies(1)); | |
+ schedule_msec_hrtimeout((1)); | |
spin_lock_irqsave(&fnic->wq_copy_lock[0], flags); | |
@@ -2155,7 +2155,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic, | |
ret = iter_data.ret; | |
goto clean_pending_aborts_end; | |
} | |
- schedule_timeout(msecs_to_jiffies(2 * fnic->config.ed_tov)); | |
+ schedule_msec_hrtimeout((2 * fnic->config.ed_tov)); | |
/* walk again to check, if IOs are still pending in fw */ | |
if (fnic_is_abts_pending(fnic, lr_sc)) | |
diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c | |
index 961af6fc21bc..951eb806217b 100644 | |
--- a/drivers/scsi/snic/snic_scsi.c | |
+++ b/drivers/scsi/snic/snic_scsi.c | |
@@ -2332,7 +2332,7 @@ snic_reset(struct Scsi_Host *shost, struct scsi_cmnd *sc) | |
/* Wait for all the IOs that are entered in Qcmd */ | |
while (atomic_read(&snic->ios_inflight)) | |
- schedule_timeout(msecs_to_jiffies(1)); | |
+ schedule_msec_hrtimeout((1)); | |
ret = snic_issue_hba_reset(snic, sc); | |
if (ret) { | |
diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c | |
index 2284a96abcff..0bd7edb90157 100644 | |
--- a/drivers/staging/rts5208/rtsx.c | |
+++ b/drivers/staging/rts5208/rtsx.c | |
@@ -470,7 +470,7 @@ static int rtsx_polling_thread(void *__dev) | |
for (;;) { | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(msecs_to_jiffies(POLLING_INTERVAL)); | |
+ schedule_msec_hrtimeout((POLLING_INTERVAL)); | |
/* lock the device pointers */ | |
mutex_lock(&dev->dev_mutex); | |
diff --git a/drivers/video/fbdev/omap/hwa742.c b/drivers/video/fbdev/omap/hwa742.c | |
index 161fc65d6b57..b65388134829 100644 | |
--- a/drivers/video/fbdev/omap/hwa742.c | |
+++ b/drivers/video/fbdev/omap/hwa742.c | |
@@ -926,7 +926,7 @@ static void hwa742_resume(void) | |
if (hwa742_read_reg(HWA742_PLL_DIV_REG) & (1 << 7)) | |
break; | |
set_current_state(TASK_UNINTERRUPTIBLE); | |
- schedule_timeout(msecs_to_jiffies(5)); | |
+ schedule_msec_hrtimeout((5)); | |
} | |
hwa742_set_update_mode(hwa742.update_mode_before_suspend); | |
} | |
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c | |
index 696ac5431180..27336843c2ea 100644 | |
--- a/drivers/video/fbdev/pxafb.c | |
+++ b/drivers/video/fbdev/pxafb.c | |
@@ -1287,7 +1287,7 @@ static int pxafb_smart_thread(void *arg) | |
mutex_unlock(&fbi->ctrlr_lock); | |
set_current_state(TASK_INTERRUPTIBLE); | |
- schedule_timeout(msecs_to_jiffies(30)); | |
+ schedule_msec_hrtimeout((30)); | |
} | |
pr_debug("%s(): task ending\n", __func__); | |
diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c | |
index 118b2e20b2e1..bf4cd9fbc9eb 100644 | |
--- a/fs/btrfs/delalloc-space.c | |
+++ b/fs/btrfs/delalloc-space.c | |
@@ -322,7 +322,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes, | |
flush = BTRFS_RESERVE_FLUSH_LIMIT; | |
if (btrfs_transaction_in_commit(fs_info)) | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} | |
num_bytes = ALIGN(num_bytes, fs_info->sectorsize); | |
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c | |
index 6a4af725aedd..aeecf54b7a9f 100644 | |
--- a/sound/usb/line6/pcm.c | |
+++ b/sound/usb/line6/pcm.c | |
@@ -127,7 +127,7 @@ static void line6_wait_clear_audio_urbs(struct snd_line6_pcm *line6pcm, | |
if (!alive) | |
break; | |
set_current_state(TASK_UNINTERRUPTIBLE); | |
- schedule_timeout(1); | |
+ schedule_min_hrtimeout(); | |
} while (--timeout > 0); | |
if (alive) | |
dev_err(line6pcm->line6->ifcdev, | |
-- | |
2.40.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment