From 8baeb91d232e70ff0287081bff9f1227ad88bd8d Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Mon, 11 Jan 2021 11:02:06 -0800 Subject: [PATCH] net/ionic: set port admin state to up in port init This reduces the startup time a bit. Signed-off-by: Andrew Boyer Signed-off-by: Neel Patel --- drivers/net/ionic/ionic_main.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index ce5d113118..467696a546 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -403,21 +403,13 @@ ionic_port_init(struct ionic_adapter *adapter) for (i = 0; i < nwords; i++) iowrite32(ident->port.config.words[i], &idev->dev_cmd->data[i]); + idev->port_info->config.state = IONIC_PORT_ADMIN_STATE_UP; ionic_dev_cmd_port_init(idev); err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - if (err) { + if (err) IONIC_PRINT(ERR, "Failed to init port"); - return err; - } - - ionic_dev_cmd_port_state(idev, IONIC_PORT_ADMIN_STATE_UP); - err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT); - if (err) { - IONIC_PRINT(WARNING, "Failed to bring port UP"); - return err; - } - return 0; + return err; } int -- 2.20.1