libata: kill ATA_EHI_RESUME_LINK (672b2d65) · Commits · 戴 / test

drivers/ata/libata-eh.c

+8 −13

Original line number	Diff line number	Diff line
		@@ -1079,12 +1079,6 @@ void ata_eh_about_to_do(struct ata_link link, struct ata_device dev,

		spin_lock_irqsave(ap->lock, flags);

		/* suck in and clear reset modifier */
		if (action & ATA_EH_RESET) {
		ehc->i.flags \|= ehi->flags & ATA_EHI_RESET_MODIFIER_MASK;
		ehi->flags &= ~ATA_EHI_RESET_MODIFIER_MASK;
		}

		ata_eh_clear_action(link, dev, ehi, action);

		if (!(ehc->i.flags & ATA_EHI_QUIET))
		@@ -1110,10 +1104,6 @@ void ata_eh_done(struct ata_link link, struct ata_device dev,
		{
		struct ata_eh_context *ehc = &link->eh_context;

		/* if reset is complete, clear reset modifier */
		if (action & ATA_EH_RESET)
		ehc->i.flags &= ~ATA_EHI_RESET_MODIFIER_MASK;

		ata_eh_clear_action(link, dev, &ehc->i, action);
		}

		@@ -2491,6 +2481,7 @@ static int ata_link_nr_vacant(struct ata_link *link)

		static int ata_eh_skip_recovery(struct ata_link *link)
		{
		struct ata_port *ap = link->ap;
		struct ata_eh_context *ehc = &link->eh_context;
		struct ata_device *dev;

		@@ -2498,9 +2489,13 @@ static int ata_eh_skip_recovery(struct ata_link *link)
		if (link->flags & ATA_LFLAG_DISABLED)
		return 1;

		/* thaw frozen port, resume link and recover failed devices */
		if ((link->ap->pflags & ATA_PFLAG_FROZEN) \|\|
		(ehc->i.flags & ATA_EHI_RESUME_LINK) \|\| ata_link_nr_enabled(link))
		/* thaw frozen port and recover failed devices */
		if ((ap->pflags & ATA_PFLAG_FROZEN) \|\| ata_link_nr_enabled(link))
		return 0;

		/* reset at least once if reset is requested */
		if ((ehc->i.action & ATA_EH_RESET) &&
		!(ehc->i.flags & ATA_EHI_DID_RESET))
		return 0;

		/* skip if class codes for all vacant slots are ATA_DEV_NONE */

drivers/ata/libata-pmp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -437,7 +437,6 @@ static int sata_pmp_init_links(struct ata_port *ap, int nr_ports)
		link->flags = 0;
		ehc->i.probe_mask \|= 1;
		ehc->i.action \|= ATA_EH_RESET;
		ehc->i.flags \|= ATA_EHI_RESUME_LINK;
		}

		return 0;

drivers/ata/libata-scsi.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -3517,7 +3517,6 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
		struct ata_eh_info *ehi = &dev->link->eh_info;
		ehi->probe_mask \|= 1 << dev->devno;
		ehi->action \|= ATA_EH_RESET;
		ehi->flags \|= ATA_EHI_RESUME_LINK;
		} else
		rc = -EINVAL;
		}

include/linux/libata.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -301,7 +301,6 @@ enum {

		/* ata_eh_info->flags */
		ATA_EHI_HOTPLUGGED = (1 << 0), /* could have been hotplugged */
		ATA_EHI_RESUME_LINK = (1 << 1), /* resume link (reset modifier) */
		ATA_EHI_NO_AUTOPSY = (1 << 2), /* no autopsy */
		ATA_EHI_QUIET = (1 << 3), /* be quiet */

		@@ -312,7 +311,6 @@ enum {
		ATA_EHI_POST_SETMODE = (1 << 20), /* revaildating after setmode */

		ATA_EHI_DID_RESET = ATA_EHI_DID_SOFTRESET \| ATA_EHI_DID_HARDRESET,
		ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,

		/* max tries if error condition is still set after ->error_handler */
		ATA_EH_MAX_TRIES = 5,
		@@ -1095,7 +1093,6 @@ extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);

		static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi)
		{
		ehi->flags \|= ATA_EHI_RESUME_LINK;
		ehi->action \|= ATA_EH_RESET;
		ehi->probe_mask \|= (1 << ATA_MAX_DEVICES) - 1;
		}

Admin message