@@ -340,19 +340,14 @@ static unsigned int pata_s3c_devchk(struct ata_port *ap,
static int pata_s3c_wait_after_reset(struct ata_link *link,
unsigned long deadline)
{
- int rc;
-
ata_msleep(link->ap, ATA_WAIT_AFTER_RESET);
- /* always check readiness of the master device */
- rc = ata_sff_wait_ready(link, deadline);
- /* -ENODEV means the odd clown forgot the D7 pulldown resistor
+ /*
+ * always check readiness of the master device.
+ * -ENODEV means the odd clown forgot the D7 pulldown resistor
* and TF status is 0xff, bail out on it too.
*/
- if (rc)
- return rc;
-
- return 0;
+ return ata_sff_wait_ready(link, deadline);
}
/*
Simplify the return expression. Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- drivers/ata/pata_samsung_cf.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)