diff options
author | Vasu Dev <vasu.dev@intel.com> | 2010-04-09 17:22:54 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 15:02:38 -0400 |
commit | 8ba00a4bbbbcb39d077e837555dfa9ff0de4202e (patch) | |
tree | aa07f2c02b6b5d247b752d90b40f6ff7198e19fa /drivers/scsi/fcoe/fcoe.c | |
parent | d9e9ab56b687da0b3ecb29f7a77f25aa7ae078fb (diff) |
[SCSI] fcoe: removes unused shost in fcoe_shost_config
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/fcoe/fcoe.c')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index d16dd1232572..4d46b71849ab 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -655,15 +655,13 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev) | |||
655 | /** | 655 | /** |
656 | * fcoe_shost_config() - Set up the SCSI host associated with a local port | 656 | * fcoe_shost_config() - Set up the SCSI host associated with a local port |
657 | * @lport: The local port | 657 | * @lport: The local port |
658 | * @shost: The SCSI host to associate with the local port | ||
659 | * @dev: The device associated with the SCSI host | 658 | * @dev: The device associated with the SCSI host |
660 | * | 659 | * |
661 | * Must be called after fcoe_lport_config() and fcoe_netdev_config() | 660 | * Must be called after fcoe_lport_config() and fcoe_netdev_config() |
662 | * | 661 | * |
663 | * Returns: 0 for success | 662 | * Returns: 0 for success |
664 | */ | 663 | */ |
665 | static int fcoe_shost_config(struct fc_lport *lport, struct Scsi_Host *shost, | 664 | static int fcoe_shost_config(struct fc_lport *lport, struct device *dev) |
666 | struct device *dev) | ||
667 | { | 665 | { |
668 | int rc = 0; | 666 | int rc = 0; |
669 | 667 | ||
@@ -899,7 +897,6 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, | |||
899 | struct net_device *netdev = fcoe->netdev; | 897 | struct net_device *netdev = fcoe->netdev; |
900 | struct fc_lport *lport = NULL; | 898 | struct fc_lport *lport = NULL; |
901 | struct fcoe_port *port; | 899 | struct fcoe_port *port; |
902 | struct Scsi_Host *shost; | ||
903 | int rc; | 900 | int rc; |
904 | /* | 901 | /* |
905 | * parent is only a vport if npiv is 1, | 902 | * parent is only a vport if npiv is 1, |
@@ -921,7 +918,6 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, | |||
921 | rc = -ENOMEM; | 918 | rc = -ENOMEM; |
922 | goto out; | 919 | goto out; |
923 | } | 920 | } |
924 | shost = lport->host; | ||
925 | port = lport_priv(lport); | 921 | port = lport_priv(lport); |
926 | port->lport = lport; | 922 | port->lport = lport; |
927 | port->fcoe = fcoe; | 923 | port->fcoe = fcoe; |
@@ -951,7 +947,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe, | |||
951 | } | 947 | } |
952 | 948 | ||
953 | /* configure lport scsi host properties */ | 949 | /* configure lport scsi host properties */ |
954 | rc = fcoe_shost_config(lport, shost, parent); | 950 | rc = fcoe_shost_config(lport, parent); |
955 | if (rc) { | 951 | if (rc) { |
956 | FCOE_NETDEV_DBG(netdev, "Could not configure shost for the " | 952 | FCOE_NETDEV_DBG(netdev, "Could not configure shost for the " |
957 | "interface\n"); | 953 | "interface\n"); |