Commit 8ba00a4b authored by Vasu Dev's avatar Vasu Dev Committed by James Bottomley
Browse files

[SCSI] fcoe: removes unused shost in fcoe_shost_config 



Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent d9e9ab56

drivers/scsi/fcoe/fcoe.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -655,15 +655,13 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev) 
/**

/**

 * fcoe_shost_config() - Set up the SCSI host associated with a local port

 * fcoe_shost_config() - Set up the SCSI host associated with a local port

 * @lport: The local port

 * @lport: The local port

 * @shost: The SCSI host to associate with the local port

 * @dev:   The device associated with the SCSI host

 * @dev:   The device associated with the SCSI host

 *

 *

 * Must be called after fcoe_lport_config() and fcoe_netdev_config()

 * Must be called after fcoe_lport_config() and fcoe_netdev_config()

 *

 *

 * Returns: 0 for success

 * Returns: 0 for success

 */

 */

static int fcoe_shost_config(struct fc_lport *lport, struct Scsi_Host *shost,

static int fcoe_shost_config(struct fc_lport *lport, struct device *dev)

			     struct device *dev)

{

{

	int rc = 0;

	int rc = 0;
@@ -899,7 +897,6 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, 
	struct net_device *netdev = fcoe->netdev;

	struct net_device *netdev = fcoe->netdev;

	struct fc_lport *lport = NULL;

	struct fc_lport *lport = NULL;

	struct fcoe_port *port;

	struct fcoe_port *port;

	struct Scsi_Host *shost;

	int rc;

	int rc;

	/*

	/*

	 * parent is only a vport if npiv is 1,

	 * parent is only a vport if npiv is 1,
@@ -921,7 +918,6 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, 
		rc = -ENOMEM;

		rc = -ENOMEM;

		goto out;

		goto out;

	}

	}

	shost = lport->host;

	port = lport_priv(lport);

	port = lport_priv(lport);

	port->lport = lport;

	port->lport = lport;

	port->fcoe = fcoe;

	port->fcoe = fcoe;
@@ -951,7 +947,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, 
	}

	}





	/* configure lport scsi host properties */

	/* configure lport scsi host properties */

	rc = fcoe_shost_config(lport, shost, parent);

	rc = fcoe_shost_config(lport, parent);

	if (rc) {

	if (rc) {

		FCOE_NETDEV_DBG(netdev, "Could not configure shost for the "

		FCOE_NETDEV_DBG(netdev, "Could not configure shost for the "

				"interface\n");

				"interface\n");