From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ravikiran G Thirumalai Subject: [patch 4/4] ide: Break ide_lock -- remove ide_lock from piix driver Date: Tue, 6 Sep 2005 16:44:29 -0700 Message-ID: <20050906234429.GE3642@localhost.localdomain> References: <20050906233322.GA3642@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from serv01.siteground.net ([70.85.91.68]:54955 "EHLO serv01.siteground.net") by vger.kernel.org with ESMTP id S1751134AbVIFXo3 (ORCPT ); Tue, 6 Sep 2005 19:44:29 -0400 Content-Disposition: inline In-Reply-To: <20050906233322.GA3642@localhost.localdomain> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Bartlomiej Zolnierkiewicz Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, "Shai Fultheim (Shai@scalex86.org)" , Alok Kataria Patch to convert piix driver to use per-driver/hwgroup lock and kill ide_lock. In the case of piix, hwgroup->lock should be sufficient. Signed-off-by: Ravikiran Thirumalai Index: linux-2.6.13/drivers/ide/pci/piix.c =================================================================== --- linux-2.6.13.orig/drivers/ide/pci/piix.c 2005-09-06 12:00:25.000000000 -0700 +++ linux-2.6.13/drivers/ide/pci/piix.c 2005-09-06 13:22:49.000000000 -0700 @@ -231,7 +231,6 @@ pio = ide_get_best_pio_mode(drive, pio, 5, NULL); spin_lock_irqsave(&hwgroup->lock, flags); - spin_lock(&ide_lock); pci_read_config_word(dev, master_port, &master_data); if (is_slave) { master_data = master_data | 0x4000; @@ -251,7 +250,6 @@ pci_write_config_word(dev, master_port, master_data); if (is_slave) pci_write_config_byte(dev, slave_port, slave_data); - spin_unlock(&ide_lock); spin_unlock_irqrestore(&hwgroup->lock, flags); }