Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f65ca6 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: implement and use ata_deh_dev_action() 



Implement and use ata_eh_dev_action() which returns EH action mask for
a device.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent af181c2d

drivers/scsi/libata-eh.c

+8 −1
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ static int ata_ering_map(struct ata_ering *ering, 
	return rc;

}



static unsigned int ata_eh_dev_action(struct ata_device *dev)

{

	struct ata_eh_context *ehc = &dev->ap->eh_context;



	return ehc->i.action | ehc->i.dev_action[dev->devno];

}



static void ata_eh_clear_action(struct ata_device *dev,

				struct ata_eh_info *ehi, unsigned int action)

{
@@ -1592,7 +1599,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 
		unsigned int action;



		dev = &ap->device[i];

		action = ehc->i.action | ehc->i.dev_action[dev->devno];

		action = ata_eh_dev_action(dev);



		if (action & ATA_EH_REVALIDATE && ata_dev_enabled(dev)) {

			if (ata_port_offline(ap)) {