Skip to contentSkip to conversation

sound/oss: use current->state helpers

PATCH In review Davidlohr Bueso 2 participants 6 messages Jan 15, 2015 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sound/oss: use current->state helpers

From: Davidlohr Bueso <[email protected]>

Call __set_current_state() instead of assigning the new state directly. These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping track of who changed the state.

---
 sound/oss/msnd_pinnacle.c | 4 ++--
 sound/oss/swarm_cs4297a.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
sound/oss/msnd_pinnacle.c +2 -2
index c23f9f9..a8ceef8 100644
@@ -675,7 +675,7 @@ static void dsp_write_flush(void)
 		timeout);
 	clear_bit(F_WRITEFLUSH, &dev.flags);
 	if (!signal_pending(current)) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE));
 	}
 	clear_bit(F_WRITING, &dev.flags);
@@ -1288,7 +1288,7 @@ static int __init calibrate_adc(WORD srate)
 		       & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);
 	if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &&
 	    chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(HZ / 3);
 		return 0;
 	}
sound/oss/swarm_cs4297a.c +1 -1
index a33e8ce..213a416 100644
@@ -1654,7 +1654,7 @@ static int drain_dac(struct cs4297a_state *s, int nonblock)
         s->dma_dac.hwptr = s->dma_dac.swptr = hwptr;
         spin_unlock_irqrestore(&s->lock, flags);
 	remove_wait_queue(&s->dma_dac.wait, &wait);
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	return 0;
 }
 
Signature · 1 line
2.1.2
#1 lore raw

At Wed, 14 Jan 2015 23:11:43 -0800,

Quoted 8 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

Call __set_current_state() instead of assigning the new state directly. These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping track of who changed the state.

The author and sign-off have different addresses. Could you align?

thanks,

Takashi

Quoted 46 lines
---
 sound/oss/msnd_pinnacle.c | 4 ++--
 sound/oss/swarm_cs4297a.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
sound/oss/msnd_pinnacle.c +2 -2
index c23f9f9..a8ceef8 100644
@@ -675,7 +675,7 @@ static void dsp_write_flush(void)
 		timeout);
 	clear_bit(F_WRITEFLUSH, &dev.flags);
 	if (!signal_pending(current)) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE));
 	}
 	clear_bit(F_WRITING, &dev.flags);
@@ -1288,7 +1288,7 @@ static int __init calibrate_adc(WORD srate)
 		       & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags);
 	if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 &&
 	    chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) {
-		current->state = TASK_INTERRUPTIBLE;
+		__set_current_state(TASK_INTERRUPTIBLE);
 		schedule_timeout(HZ / 3);
 		return 0;
 	}
sound/oss/swarm_cs4297a.c +1 -1
index a33e8ce..213a416 100644
@@ -1654,7 +1654,7 @@ static int drain_dac(struct cs4297a_state *s, int nonblock)
         s->dma_dac.hwptr = s->dma_dac.swptr = hwptr;
         spin_unlock_irqrestore(&s->lock, flags);
 	remove_wait_queue(&s->dma_dac.wait, &wait);
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	return 0;
 }
 
Signature · 1 line
2.1.2
#2 lore raw
Quoted 5 lines · Takashi Iwai

At Wed, 14 Jan 2015 23:11:43 -0800,

Quoted 3 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

Quoted 7 lines
Quoted 5 lines

Call __set_current_state() instead of assigning the new state directly. These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping track of who changed the state.

The author and sign-off have different addresses. Could you align?

I don't see a problem with that. All my patches are the same.

Thanks,
Davidlohr

#3 lore raw

At Wed, 14 Jan 2015 23:51:30 -0800,

Quoted 11 lines · Davidlohr Bueso
Quoted 9 lines · Takashi Iwai

At Wed, 14 Jan 2015 23:11:43 -0800,

Quoted 7 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

Call __set_current_state() instead of assigning the new state directly. These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping track of who changed the state.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

The author and sign-off have different addresses. Could you align?

I don't see a problem with that. All my patches are the same.

Well, it's a bit unusual. Why do they need to differ? Is the author another Davidlohr? :) If this form is preferred, I'm willing to apply, but I just wonder...

Takashi

#4 lore raw
Quoted 3 lines · Takashi Iwai

Well, it's a bit unusual. Why do they need to differ? Is the author another Davidlohr? :) If this form is preferred, I'm willing to apply, but I just wonder...

Personal taste, really. Yes I'd prefer you apply as is.

Thanks,
Davidlohr

#5 lore raw

At Thu, 15 Jan 2015 00:17:25 -0800,

Quoted 7 lines · Davidlohr Bueso
Quoted 3 lines · Takashi Iwai

Well, it's a bit unusual. Why do they need to differ? Is the author another Davidlohr? :) If this form is preferred, I'm willing to apply, but I just wonder...

Personal taste, really. Yes I'd prefer you apply as is.

OK, applied now. Thanks.

Takashi