Skip to contentSkip to conversation

libata: cosmetic clean up in ata_eh_reset()

PATCH Applied Tejun Heo 2 participants 2 messages Oct 24, 2007 – Oct 25, 2007 libata

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 libata: cosmetic clean up in ata_eh_reset()

Local variable @action usage in ata_eh_reset() is a bit confusing. It's used only to cache ehc->i.action to test reset masks after clearing it; however, due to the generic name "action", it's easy to misinterpret the local variable as containing the selected reset method later. Also, the reason for caching the original value is easy to miss.

This patch renames @action to @tmp_action and make it buffer newly selected value instead to improve readability.

Signed-off-by Tejun Heo <[email protected]>
---
 drivers/ata/libata-eh.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/ata/libata-eh.c +6 -6
index 93e2b54..8cb35bb 100644
@@ -2071,7 +2071,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
 	int try = 0;
 	struct ata_device *dev;
 	unsigned long deadline;
-	unsigned int action;
+	unsigned int tmp_action;
 	ata_reset_fn_t reset;
 	unsigned long flags;
 	int rc;

@@ -2086,14 +2086,14 @@ int ata_eh_reset(struct ata_link *link, int classify,
 	/* Determine which reset to use and record in ehc->i.action.
 	 * prereset() may examine and modify it.
 	 */
-	action = ehc->i.action;
-	ehc->i.action &= ~ATA_EH_RESET_MASK;
 	if (softreset && (!hardreset || (!(link->flags & ATA_LFLAG_NO_SRST) &&
 					 !sata_set_spd_needed(link) &&
-					 !(action & ATA_EH_HARDRESET))))
-		ehc->i.action |= ATA_EH_SOFTRESET;
+					 !(ehc->i.action & ATA_EH_HARDRESET))))
+		tmp_action = ATA_EH_SOFTRESET;
 	else
-		ehc->i.action |= ATA_EH_HARDRESET;
+		tmp_action = ATA_EH_HARDRESET;
+
+	ehc->i.action = (ehc->i.action & ~ATA_EH_RESET_MASK) | tmp_action;
 
 	if (prereset) {
 		rc = prereset(link, jiffies + ATA_EH_PRERESET_TIMEOUT);
Applied
#1 lore raw
Quoted 7 lines · Tejun Heo

Local variable @action usage in ata_eh_reset() is a bit confusing. It's used only to cache ehc->i.action to test reset masks after clearing it; however, due to the generic name "action", it's easy to misinterpret the local variable as containing the selected reset method later. Also, the reason for caching the original value is easy to miss.

Quoted 7 lines

This patch renames @action to @tmp_action and make it buffer newly selected value instead to improve readability.

Signed-off-by Tejun Heo <[email protected]>
---
 drivers/ata/libata-eh.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

applied