| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * QLogic qlcnic NIC Driver |
|---|
| 3 | 4 | * Copyright (c) 2009-2013 QLogic Corporation |
|---|
| 4 | | - * |
|---|
| 5 | | - * See LICENSE.qlcnic for copyright and licensing details. |
|---|
| 6 | 5 | */ |
|---|
| 7 | 6 | |
|---|
| 8 | 7 | #include <linux/if_vlan.h> |
|---|
| .. | .. |
|---|
| 658 | 657 | void qlcnic_83xx_cam_unlock(struct qlcnic_adapter *adapter) |
|---|
| 659 | 658 | { |
|---|
| 660 | 659 | void __iomem *addr; |
|---|
| 661 | | - u32 val; |
|---|
| 662 | 660 | struct qlcnic_hardware_context *ahw = adapter->ahw; |
|---|
| 663 | 661 | |
|---|
| 664 | 662 | addr = ahw->pci_base0 + QLC_83XX_SEM_UNLOCK_FUNC(ahw->pci_func); |
|---|
| 665 | | - val = readl(addr); |
|---|
| 663 | + readl(addr); |
|---|
| 666 | 664 | } |
|---|
| 667 | 665 | |
|---|
| 668 | 666 | void qlcnic_83xx_read_crb(struct qlcnic_adapter *adapter, char *buf, |
|---|
| .. | .. |
|---|
| 2993 | 2991 | QLCWRX(adapter->ahw, QLC_83XX_RECOVER_DRV_LOCK, val); |
|---|
| 2994 | 2992 | dev_info(&adapter->pdev->dev, |
|---|
| 2995 | 2993 | "%s: lock recovery initiated\n", __func__); |
|---|
| 2996 | | - msleep(QLC_83XX_DRV_LOCK_RECOVERY_DELAY); |
|---|
| 2994 | + mdelay(QLC_83XX_DRV_LOCK_RECOVERY_DELAY); |
|---|
| 2997 | 2995 | val = QLCRDX(adapter->ahw, QLC_83XX_RECOVER_DRV_LOCK); |
|---|
| 2998 | 2996 | id = ((val >> 2) & 0xF); |
|---|
| 2999 | 2997 | if (id == adapter->portnum) { |
|---|
| .. | .. |
|---|
| 3029 | 3027 | if (status) |
|---|
| 3030 | 3028 | break; |
|---|
| 3031 | 3029 | |
|---|
| 3032 | | - msleep(QLC_83XX_DRV_LOCK_WAIT_DELAY); |
|---|
| 3030 | + mdelay(QLC_83XX_DRV_LOCK_WAIT_DELAY); |
|---|
| 3033 | 3031 | i++; |
|---|
| 3034 | 3032 | |
|---|
| 3035 | 3033 | if (i == 1) |
|---|
| .. | .. |
|---|
| 3821 | 3819 | { |
|---|
| 3822 | 3820 | struct qlcnic_adapter *adapter = pci_get_drvdata(pdev); |
|---|
| 3823 | 3821 | struct net_device *netdev = adapter->netdev; |
|---|
| 3824 | | - int retval; |
|---|
| 3825 | 3822 | |
|---|
| 3826 | 3823 | netif_device_detach(netdev); |
|---|
| 3827 | 3824 | qlcnic_cancel_idc_work(adapter); |
|---|
| .. | .. |
|---|
| 3832 | 3829 | qlcnic_83xx_disable_mbx_intr(adapter); |
|---|
| 3833 | 3830 | cancel_delayed_work_sync(&adapter->idc_aen_work); |
|---|
| 3834 | 3831 | |
|---|
| 3835 | | - retval = pci_save_state(pdev); |
|---|
| 3836 | | - if (retval) |
|---|
| 3837 | | - return retval; |
|---|
| 3838 | | - |
|---|
| 3839 | | - return 0; |
|---|
| 3832 | + return pci_save_state(pdev); |
|---|
| 3840 | 3833 | } |
|---|
| 3841 | 3834 | |
|---|
| 3842 | 3835 | static int qlcnic_83xx_resume(struct qlcnic_adapter *adapter) |
|---|
| .. | .. |
|---|
| 4243 | 4236 | { |
|---|
| 4244 | 4237 | struct qlcnic_adapter *adapter = pci_get_drvdata(pdev); |
|---|
| 4245 | 4238 | |
|---|
| 4246 | | - pci_cleanup_aer_uncorrect_error_status(pdev); |
|---|
| 4247 | 4239 | if (test_and_clear_bit(__QLCNIC_AER, &adapter->state)) |
|---|
| 4248 | 4240 | qlcnic_83xx_aer_start_poll_work(adapter); |
|---|
| 4249 | 4241 | } |
|---|