Skip to content

Commit 77461a3

Browse files
hreineckedamien-lemoal
authored andcommitted
ata: libata-core: inline ata_port_probe()
Just used in one place. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent 8ac161e commit 77461a3

1 file changed

Lines changed: 2 additions & 9 deletions

File tree

drivers/ata/libata-core.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5884,14 +5884,6 @@ void __ata_port_probe(struct ata_port *ap)
58845884
spin_unlock_irqrestore(ap->lock, flags);
58855885
}
58865886

5887-
int ata_port_probe(struct ata_port *ap)
5888-
{
5889-
__ata_port_probe(ap);
5890-
ata_port_wait_eh(ap);
5891-
return 0;
5892-
}
5893-
5894-
58955887
static void async_port_probe(void *data, async_cookie_t cookie)
58965888
{
58975889
struct ata_port *ap = data;
@@ -5906,7 +5898,8 @@ static void async_port_probe(void *data, async_cookie_t cookie)
59065898
if (!(ap->host->flags & ATA_HOST_PARALLEL_SCAN) && ap->port_no != 0)
59075899
async_synchronize_cookie(cookie);
59085900

5909-
(void)ata_port_probe(ap);
5901+
__ata_port_probe(ap);
5902+
ata_port_wait_eh(ap);
59105903

59115904
/* in order to keep device order, we need to synchronize at this point */
59125905
async_synchronize_cookie(cookie);

0 commit comments

Comments
 (0)