After the previous patch, fcoe_if_destroy always returns 0, so make it return void and remove the checks in the caller.
Signed-off-by: Joe Eykholt <[email protected]> --- drivers/scsi/fcoe/fcoe.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index fb7ab8b..91edf2d 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -499,10 +499,8 @@ skip_oem: /** * fcoe_if_destroy() - FCoE software HBA tear-down function * @netdev: ptr to the associated net_device - * - * Returns: 0 if link is OK for use by FCoE. */ -static int fcoe_if_destroy(struct fcoe_softc *fc) +static void fcoe_if_destroy(struct fcoe_softc *fc) { struct fc_lport *lp; @@ -544,8 +542,6 @@ static int fcoe_if_destroy(struct fcoe_softc *fc) /* Release the net_device and Scsi_Host */ dev_put(fc->real_dev); scsi_host_put(lp->host); - - return 0; } /* @@ -1623,13 +1619,7 @@ static int fcoe_destroy(const char *buffer, struct kernel_param *kp) list_del(&fc->list); write_unlock_bh(&fcoe_hostlist_lock); - rc = fcoe_if_destroy(fc); - if (rc) { - printk(KERN_ERR "fcoe: Failed to destroy interface (%s)\n", - netdev->name); - rc = -EIO; - goto out_putdev; - } + fcoe_if_destroy(fc); fcoe_ethdrv_put(netdev); rc = 0; out_putdev: _______________________________________________ devel mailing list [email protected] http://www.open-fcoe.org/mailman/listinfo/devel
