diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
| commit | c1144d29f405ce1f4e6ede6482beb3d0d09750c6 (patch) | |
| tree | 0f9fe36a50005bae6ffe28a4f978e71273f5b1d1 /drivers/scsi/ufs/ufshcd-pci.c | |
| parent | d6c70a86bc72fabe7fc9d9533afdb46a56c16896 (diff) | |
| parent | a317e559574b2af62095b39792d168cb98cb2561 (diff) | |
| download | linux-c1144d29f405ce1f4e6ede6482beb3d0d09750c6.tar.xz | |
Merge branch 'for-4.18/alps' into for-linus
hid-alps driver cleanups wrt. t4_read_write_register() handling
from Christophe Jaillet
Diffstat (limited to 'drivers/scsi/ufs/ufshcd-pci.c')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd-pci.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index 925b0ec7ec54..ffe6f82182ba 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c @@ -75,8 +75,7 @@ static struct ufs_hba_variant_ops ufs_intel_cnl_hba_vops = { #ifdef CONFIG_PM_SLEEP /** * ufshcd_pci_suspend - suspend power management function - * @pdev: pointer to PCI device handle - * @state: power state + * @dev: pointer to PCI device handle * * Returns 0 if successful * Returns non-zero otherwise @@ -88,7 +87,7 @@ static int ufshcd_pci_suspend(struct device *dev) /** * ufshcd_pci_resume - resume power management function - * @pdev: pointer to PCI device handle + * @dev: pointer to PCI device handle * * Returns 0 if successful * Returns non-zero otherwise @@ -126,7 +125,7 @@ static void ufshcd_pci_shutdown(struct pci_dev *pdev) /** * ufshcd_pci_remove - de-allocate PCI/SCSI host and host memory space * data structure memory - * @pdev - pointer to PCI handle + * @pdev: pointer to PCI handle */ static void ufshcd_pci_remove(struct pci_dev *pdev) { |