All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Daniel Walker <dwalker@mvista.com>,
	Aleksey Makarov <amakarov@dev.rtsoft.ru>
Subject: [PATCH -rt] convert compat sem in block device sx8
Date: Fri, 25 Nov 2005 17:50:25 -0500	[thread overview]
Message-ID: <1132959025.24417.30.camel@localhost.localdomain> (raw)
In-Reply-To: <1132929218.11915.2.camel@localhost.localdomain>

Ingo,

I decided to add a few more conversions to the list :-)

Here's sx8. Unfortunately, I was only able to test compiling it, since I
don't have the hardware. Hence, I'm not sending this to mainline unless
someone can test it on yours. (your patch is the new -mm ;-)

-- Steve

Index: linux-2.6.14-rt15/drivers/block/sx8.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/block/sx8.c	2005-11-25 10:14:09.000000000 -0500
+++ linux-2.6.14-rt15/drivers/block/sx8.c	2005-11-25 16:55:01.000000000 -0500
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
@@ -280,10 +281,7 @@
 
 	struct work_struct		fsm_task;
 
-	/*
-	 * PREEMPT_RT: should be converted to completions.
-	 */
-	struct compat_semaphore		probe_sem;
+	struct completion		probe_comp;
 };
 
 struct carm_response {
@@ -1345,7 +1343,7 @@
 	}
 
 	case HST_PROBE_FINISHED:
-		up(&host->probe_sem);
+		completion(&host->probe_comp);
 		break;
 
 	case HST_ERROR:
@@ -1621,7 +1619,7 @@
 	host->flags = pci_dac ? FL_DAC : 0;
 	spin_lock_init(&host->lock);
 	INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-	init_MUTEX_LOCKED(&host->probe_sem);
+	init_completion(&host->probe_comp);
 
 	for (i = 0; i < ARRAY_SIZE(host->req); i++)
 		host->req[i].tag = i;
@@ -1690,8 +1688,8 @@
 	if (rc)
 		goto err_out_free_irq;
 
-	DPRINTK("waiting for probe_sem\n");
-	down(&host->probe_sem);
+	DPRINTK("waiting for probe_comp\n");
+	wait_for_completion(&host->probe_comp);
 
 	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
 	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,



  parent reply	other threads:[~2005-11-25 22:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-25 12:56 [PATCH] 2.6.14-rt15 IDE compat_semaphore to completion Aleksey Makarov
2005-11-25 14:54 ` Ingo Molnar
     [not found] ` <1132929218.11915.2.camel@localhost.localdomain>
2005-11-25 21:40   ` [PATCH] " Steven Rostedt
2005-11-25 22:46   ` [PATCH] 2.6.14-rt15 " Steven Rostedt
2005-11-25 22:50   ` Steven Rostedt [this message]
2005-11-25 22:57     ` [PATCH -rt] convert compat sem in block device sx8 Steven Rostedt
2005-11-26 12:33       ` Ingo Molnar
2005-11-25 22:53   ` [PATCH -rt] convert watchdog cpu5wdt from compat_sem to completion Steven Rostedt
2005-11-26 12:35     ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1132959025.24417.30.camel@localhost.localdomain \
    --to=rostedt@goodmis.org \
    --cc=amakarov@dev.rtsoft.ru \
    --cc=dwalker@mvista.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.