libata: cosmetic clean up in ata_eh_reset() (0e06d9ce) · Commits · 戴 / test

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 <htejun@gmail.com> Signed-off-by:

Jeff Garzik <jeff@garzik.org>

drivers/ata/libata-eh.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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);

Admin message