Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6855c0 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

cs5530: remove needless ide_lock taking 



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d393aa03

drivers/ide/pci/cs5530.c

+1 −7
Original line number Diff line number Diff line 
/*

 * 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_drive_t *drive, const u8 mode) 
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_chipset_cs5530 (struct pci_dev *dev, const ch 
		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_chipset_cs5530 (struct pci_dev *dev, const ch 
	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);