[PATCH 9/15] cs5530: remove needless ide_lock taking

[PATCH 9/15] cs5530: remove needless ide_lock taking

[Bartlomiej Zolnierkiewicz]

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/pci/cs5530.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Index: b/drivers/ide/pci/cs5530.c
===================================================================
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cs5530.c		Version 0.76	Aug 3 2007
+ * linux/drivers/ide/pci/cs5530.c		Version 0.77	Sep 24 2007
  *
  * Copyright (C) 2000			Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2000			Mark Lord <mlord@pobox.com>
@@ -146,7 +146,6 @@ static void cs5530_set_dma_mode(ide_driv
 static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
 {
 	struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
-	unsigned long flags;
 
 	if (pci_resource_start(dev, 4) == 0)
 		return -EFAULT;
@@ -171,9 +170,6 @@ static unsigned int __devinit init_chips
 		goto out;
 	}
 
-	spin_lock_irqsave(&ide_lock, flags);
-		/* all CPUs (there should only be one CPU with this chipset) */
-
 	/*
 	 * Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
 	 * -->  OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
@@ -224,8 +220,6 @@ static unsigned int __devinit init_chips
 	pci_write_config_byte(master_0, 0x42, 0x00);
 	pci_write_config_byte(master_0, 0x43, 0xc1);
 
-	spin_unlock_irqrestore(&ide_lock, flags);
-
 out:
 	pci_dev_put(master_0);
 	pci_dev_put(cs5530_0);

Re: [PATCH 9/15] cs5530: remove needless ide_lock taking

[Sergei Shtylyov]

Bartlomiej Zolnierkiewicz wrote:

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

MBR, Sergei

Re: [PATCH 9/15] cs5530: remove needless ide_lock taking

[Alan Cox]

> -	spin_lock_irqsave(&ide_lock, flags);
> -		/* all CPUs (there should only be one CPU with this chipset) */
> -

NAK

What about pre-emptible kernels. Put in a private lock.

Alan

Re: [PATCH 9/15] cs5530: remove needless ide_lock taking

[Bartlomiej Zolnierkiewicz]

On Tuesday 02 October 2007, Alan Cox wrote:
> > -	spin_lock_irqsave(&ide_lock, flags);
> > -		/* all CPUs (there should only be one CPU with this chipset) */
> > -
> 
> NAK
> 
> What about pre-emptible kernels. Put in a private lock.

All the removed code resided in init_chipset_cs5530() which is called only
during the controller initialization.  Moreover pata_cs5530 also don't have
any locking in cs5530_init_chip().

Bart

Re: [PATCH 9/15] cs5530: remove needless ide_lock taking

[Alan Cox]

> All the removed code resided in init_chipset_cs5530() which is called only
> during the controller initialization.  Moreover pata_cs5530 also don't have
> any locking in cs5530_init_chip().

Fair enough, and I haven't found a reason for the locking being needed
from doc reviews (hence its not in libata).