On 7/7/2016 4:43 AM, tom.t...@gmail.com wrote:
From: Tom Yan <tom.t...@gmail.com>
Signed-off-by: Tom Yan <tom.t...@gmail.com>
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index bfec66f..e3f5751 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2424,10 +2424,12 @@ static void modecpy(u8 *dest, const u8 *src, int n,
bool changeable)
static unsigned int ata_msense_caching(u16 *id, u8 *buf, bool changeable)
{
modecpy(buf, def_cache_mpage, sizeof(def_cache_mpage), changeable);
- if (changeable || ata_id_wcache_enabled(id))
- buf[2] |= (1 << 2); /* write cache enable */
- if (!changeable && !ata_id_rahead_enabled(id))
- buf[12] |= (1 << 5); /* disable read ahead */
+ if (changeable)
+ buf[2] |= (1 << 2); /* ata_mselect_caching() */
Parens not really needed.
+ else {
CodingStyle: {} should be used in all branches if used in at least one.
+ buf[2] |= (ata_id_wcache_enabled(id) << 2); /* write
cache enable */
+ buf[12] |= (!ata_id_rahead_enabled(id) << 5); /* disable
read ahead */
Outer parens not needed.
+ }
return sizeof(def_cache_mpage);
}
MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
