From 99a9a63f7c872a04491caff80a922fd3d2076e43 Mon Sep 17 00:00:00 2001 From: Kristen Carlson Accardi Date: Fri, 2 Nov 2007 16:37:08 -0700 Subject: [PATCH] --- yaml --- r: 73220 b: refs/heads/master c: f5456b63ec9fdad37b680fc9fe6fe8222d2c1839 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 18 ++++++++++-------- trunk/include/linux/ata.h | 2 -- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 73734d290465..81fa0c7f8e5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17bd9a2f4c35de29d2539a2ff6851d61be281e25 +refs/heads/master: f5456b63ec9fdad37b680fc9fe6fe8222d2c1839 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 164c7d9514f9..3ed3cf2f5568 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -676,10 +676,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) if (rc) return rc; - /* disable DIPM */ - if (ata_dev_enabled(dev) && (dev->flags & ATA_DFLAG_DIPM)) - err_mask = ata_dev_set_feature(dev, - SETFEATURES_SATA_DISABLE, SATA_DIPM); + /* + * we don't have to disable DIPM since IPM flags + * disallow transitions to SLUMBER, which effectively + * disable DIPM if it does not support PARTIAL + */ break; case NOT_AVAILABLE: case MAX_PERFORMANCE: @@ -689,10 +690,11 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) if (rc) return rc; - /* disable DIPM */ - if (ata_dev_enabled(dev) && (dev->flags & ATA_DFLAG_DIPM)) - err_mask = ata_dev_set_feature(dev, - SETFEATURES_SATA_DISABLE, SATA_DIPM); + /* + * we don't have to disable DIPM since IPM flags + * disallow all transitions which effectively + * disable DIPM anyway. + */ break; } diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h index 304825b1c977..61535e72834d 100644 --- a/trunk/include/linux/ata.h +++ b/trunk/include/linux/ata.h @@ -425,8 +425,6 @@ static inline int ata_id_has_lba48(const u16 *id) { if ((id[83] & 0xC000) != 0x4000) return 0; - if (!ata_id_u64(id, 100)) - return 0; return id[83] & (1 << 10); }