aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 07:18:07 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-19 01:24:57 -0800
commitd23f33de3c7fdc4bcbdd7a75d3f7b7be32caf18e (patch)
treec8a89fabc481fb43f59e729a473b897a77274736 /drivers/ide
parentalim15x3: remove superfluous locking from ali_set_pio_mode() (diff)
downloadlinux-dev-d23f33de3c7fdc4bcbdd7a75d3f7b7be32caf18e.tar.xz
linux-dev-d23f33de3c7fdc4bcbdd7a75d3f7b7be32caf18e.zip
alim15x3: cleanup ali_cable_detect()
Remove leftover local_irq_[save,restore]() and FIXME note. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/alim15x3.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index dabd986216fe..8f03cce055fa 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -345,19 +345,13 @@ static int ali_cable_override(struct pci_dev *pdev)
*
* This checks if the controller and the cable are capable
* of UDMA66 transfers. It doesn't check the drives.
- * But see note 2 below!
- *
- * FIXME: frobs bits that are not defined on newer ALi devicea
*/
static u8 ali_cable_detect(ide_hwif_t *hwif)
{
struct pci_dev *dev = to_pci_dev(hwif->dev);
- unsigned long flags;
u8 cbl = ATA_CBL_PATA40, tmpbyte;
- local_irq_save(flags);
-
if (m5229_revision >= 0xC2) {
/*
* m5229 80-pin cable detection (from Host View)
@@ -377,8 +371,6 @@ static u8 ali_cable_detect(ide_hwif_t *hwif)
}
}
- local_irq_restore(flags);
-
return cbl;
}