scsi: libsas: Simplify sas_ata_wait_eh()

damien-lemoal · martinkpetersen · commit 0dd03570512a · 2025-07-25T09:03:56.000-04:00
Simplify the code of sas_ata_wait_eh(), removing the local variable ap for the pointer to the device ata_port structure. The test using dev_is_sata() is also removed as all call sites of this function check if the device is a SATA one before calling this function. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Link: https://lore.kernel.org/r/20250725015818.171252-3-dlemoal@kernel.org Reviewed-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
@@ -927,13 +927,7 @@ EXPORT_SYMBOL_GPL(sas_ata_schedule_reset);
 
 void sas_ata_wait_eh(struct domain_device *dev)
 {
-	struct ata_port *ap;
-
-	if (!dev_is_sata(dev))
-		return;
-
-	ap = dev->sata_dev.ap;
-	ata_port_wait_eh(ap);
+	ata_port_wait_eh(dev->sata_dev.ap);
 }
 
 void sas_ata_device_link_abort(struct domain_device *device, bool force_reset)

Original file line number	Diff line number	Diff line change
`@@ -927,13 +927,7 @@ EXPORT_SYMBOL_GPL(sas_ata_schedule_reset);`
`927`	`927`
`928`	`928`	`void sas_ata_wait_eh(struct domain_device *dev)`
`929`	`929`	`{`
`930`		`- struct ata_port *ap;`
`931`		`-`
`932`		`- if (!dev_is_sata(dev))`
`933`		`- return;`
`934`		`-`
`935`		`- ap = dev->sata_dev.ap;`
`936`		`- ata_port_wait_eh(ap);`
	`930`	`+ ata_port_wait_eh(dev->sata_dev.ap);`
`937`	`931`	`}`
`938`	`932`
`939`	`933`	`void sas_ata_device_link_abort(struct domain_device *device, bool force_reset)`