From owner-svn-src-head@FreeBSD.ORG  Sat Dec  6 21:52:32 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3E7E1065678;
	Sat,  6 Dec 2008 21:52:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B03168FC14;
	Sat,  6 Dec 2008 21:52:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB6LqWFF006056;
	Sat, 6 Dec 2008 21:52:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB6LqWW1006055;
	Sat, 6 Dec 2008 21:52:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200812062152.mB6LqWW1006055@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 6 Dec 2008 21:52:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185722 - head/sys/dev/sdhci
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Dec 2008 21:52:32 -0000

Author: mav
Date: Sat Dec  6 21:52:32 2008
New Revision: 185722
URL: http://svn.freebsd.org/changeset/base/185722

Log:
  Cleanup msleep() arguments.
  Move wakeup() out of the lock.

Modified:
  head/sys/dev/sdhci/sdhci.c

Modified: head/sys/dev/sdhci/sdhci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci.c	Sat Dec  6 21:41:27 2008	(r185721)
+++ head/sys/dev/sdhci/sdhci.c	Sat Dec  6 21:52:32 2008	(r185722)
@@ -1207,7 +1207,7 @@ sdhci_acquire_host(device_t brdev, devic
 
 	SDHCI_LOCK(slot);
 	while (slot->bus_busy)
-		msleep(slot, &slot->mtx, PZERO, "sdhciah", hz / 5);
+		msleep(slot, &slot->mtx, 0, "sdhciah", 0);
 	slot->bus_busy++;
 	/* Activate led. */
 	WR1(slot, SDHCI_HOST_CONTROL, slot->hostctrl |= SDHCI_CTRL_LED);
@@ -1224,8 +1224,8 @@ sdhci_release_host(device_t brdev, devic
 	/* Deactivate led. */
 	WR1(slot, SDHCI_HOST_CONTROL, slot->hostctrl &= ~SDHCI_CTRL_LED);
 	slot->bus_busy--;
-	wakeup(slot);
 	SDHCI_UNLOCK(slot);
+	wakeup(slot);
 	return (0);
 }