LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 9/15] ide: factor out code removing port from hwgroup from ide_unregister()
Date: Fri, 04 Jan 2008 22:25:31 +0100	[thread overview]
Message-ID: <20080104212531.6978.41142.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20080104212424.6978.93646.sendpatchset@localhost.localdomain>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide.c |   65 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

Index: b/drivers/ide/ide.c
===================================================================
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -461,6 +461,41 @@ static void ide_hwif_restore(ide_hwif_t 
 	hwif->hwif_data			= tmp_hwif->hwif_data;
 }
 
+static void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
+{
+	ide_hwgroup_t *hwgroup = hwif->hwgroup;
+
+	spin_lock_irq(&ide_lock);
+	/*
+	 * Remove us from the hwgroup, and free
+	 * the hwgroup if we were the only member
+	 */
+	if (hwif->next == hwif) {
+		BUG_ON(hwgroup->hwif != hwif);
+		kfree(hwgroup);
+	} else {
+		/* There is another interface in hwgroup.
+		 * Unlink us, and set hwgroup->drive and ->hwif to
+		 * something sane.
+		 */
+		ide_hwif_t *g = hwgroup->hwif;
+
+		while (g->next != hwif)
+			g = g->next;
+		g->next = hwif->next;
+		if (hwgroup->hwif == hwif) {
+			/* Chose a random hwif for hwgroup->hwif.
+			 * It's guaranteed that there are no drives
+			 * left in the hwgroup.
+			 */
+			BUG_ON(hwgroup->drive != NULL);
+			hwgroup->hwif = g;
+		}
+		BUG_ON(hwgroup->hwif == hwif);
+	}
+	spin_unlock_irq(&ide_lock);
+}
+
 /**
  *	ide_unregister		-	free an IDE interface
  *	@index: index of interface (will change soon to a pointer)
@@ -528,36 +563,8 @@ void ide_unregister(unsigned int index)
 	if (irq_count == 1)
 		free_irq(hwif->irq, hwgroup);
 
-	spin_lock_irq(&ide_lock);
-	/*
-	 * Remove us from the hwgroup, and free
-	 * the hwgroup if we were the only member
-	 */
-	if (hwif->next == hwif) {
-		BUG_ON(hwgroup->hwif != hwif);
-		kfree(hwgroup);
-	} else {
-		/* There is another interface in hwgroup.
-		 * Unlink us, and set hwgroup->drive and ->hwif to
-		 * something sane.
-		 */
-		g = hwgroup->hwif;
-		while (g->next != hwif)
-			g = g->next;
-		g->next = hwif->next;
-		if (hwgroup->hwif == hwif) {
-			/* Chose a random hwif for hwgroup->hwif.
-			 * It's guaranteed that there are no drives
-			 * left in the hwgroup.
-			 */
-			BUG_ON(hwgroup->drive != NULL);
-			hwgroup->hwif = g;
-		}
-		BUG_ON(hwgroup->hwif == hwif);
-	}
+	ide_remove_port_from_hwgroup(hwif);
 
-	/* More messed up locking ... */
-	spin_unlock_irq(&ide_lock);
 	device_unregister(&hwif->gendev);
 	wait_for_completion(&hwif->gendev_rel_comp);
 

  parent reply	other threads:[~2008-01-04 21:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-04 21:24 [PATCH 0/15] ide: fixes/cleanups for IDE devices probing Bartlomiej Zolnierkiewicz
2008-01-04 21:24 ` [PATCH 1/15] ide: fix handling of busy I/O resources in probe_hwif() Bartlomiej Zolnierkiewicz
2008-01-04 21:24 ` [PATCH 2/15] ide: move wait_hwif_ready() documentation in the right place Bartlomiej Zolnierkiewicz
2008-01-09 17:47   ` Sergei Shtylyov
2008-01-09 17:53     ` Sergei Shtylyov
2008-01-04 21:24 ` [PATCH 3/15] ide: remove hwif->present manipulations from hwif_init() Bartlomiej Zolnierkiewicz
2008-01-04 21:24 ` [PATCH 4/15] ide_platform: remove struct hwif_prop Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 5/15] ide: remove unused ide_hwgroup_t fields Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 6/15] ide: remove needless zeroing of hwgroup fields from init_irq() Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 7/15] ide: cleanup ide_system_bus_speed() Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 8/15] ide: I/O resources are released too early in ide_unregister() Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` Bartlomiej Zolnierkiewicz [this message]
2008-01-04 21:25 ` [PATCH 10/15] ide: prepare init_irq() for using ide_remove_port_from_hwgroup() Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 11/15] ide: use ide_remove_port_from_hwgroup in init_irq() Bartlomiej Zolnierkiewicz
2008-01-04 21:25 ` [PATCH 12/15] ide: make probe_hwif() return an error value Bartlomiej Zolnierkiewicz
2008-01-04 21:26 ` [PATCH 13/15] ide: move handling of I/O resources out of ide_probe_port() Bartlomiej Zolnierkiewicz
2008-01-04 21:26 ` [PATCH 14/15] ide: factor out code for tuning devices from ide_probe_port() Bartlomiej Zolnierkiewicz
2008-01-04 21:26 ` [PATCH 15/15] ide: move hwif_register() call out of ide_probe_port() Bartlomiej Zolnierkiewicz

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=20080104212531.6978.41142.sendpatchset@localhost.localdomain \
    --to=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 9/15] ide: factor out code removing port from hwgroup from ide_unregister()' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).