hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/scsi/esas2r/esas2r_ioctl.c
....@@ -757,7 +757,6 @@
757757
758758 struct atto_hba_get_adapter_info *gai =
759759 &hi->data.get_adap_info;
760
- int pcie_cap_reg;
761760
762761 if (hi->flags & HBAF_TUNNEL) {
763762 hi->status = ATTO_STS_UNSUPPORTED;
....@@ -784,17 +783,14 @@
784783 gai->pci.dev_num = PCI_SLOT(a->pcid->devfn);
785784 gai->pci.func_num = PCI_FUNC(a->pcid->devfn);
786785
787
- pcie_cap_reg = pci_find_capability(a->pcid, PCI_CAP_ID_EXP);
788
- if (pcie_cap_reg) {
786
+ if (pci_is_pcie(a->pcid)) {
789787 u16 stat;
790788 u32 caps;
791789
792
- pci_read_config_word(a->pcid,
793
- pcie_cap_reg + PCI_EXP_LNKSTA,
794
- &stat);
795
- pci_read_config_dword(a->pcid,
796
- pcie_cap_reg + PCI_EXP_LNKCAP,
797
- &caps);
790
+ pcie_capability_read_word(a->pcid, PCI_EXP_LNKSTA,
791
+ &stat);
792
+ pcie_capability_read_dword(a->pcid, PCI_EXP_LNKCAP,
793
+ &caps);
798794
799795 gai->pci.link_speed_curr =
800796 (u8)(stat & PCI_EXP_LNKSTA_CLS);
....@@ -1274,7 +1270,7 @@
12741270
12751271
12761272 /* This function only cares about ATTO-specific ioctls (atto_express_ioctl) */
1277
-int esas2r_ioctl_handler(void *hostdata, int cmd, void __user *arg)
1273
+int esas2r_ioctl_handler(void *hostdata, unsigned int cmd, void __user *arg)
12781274 {
12791275 struct atto_express_ioctl *ioctl = NULL;
12801276 struct esas2r_adapter *a;
....@@ -1292,9 +1288,8 @@
12921288 ioctl = memdup_user(arg, sizeof(struct atto_express_ioctl));
12931289 if (IS_ERR(ioctl)) {
12941290 esas2r_log(ESAS2R_LOG_WARN,
1295
- "ioctl_handler access_ok failed for cmd %d, "
1296
- "address %p", cmd,
1297
- arg);
1291
+ "ioctl_handler access_ok failed for cmd %u, address %p",
1292
+ cmd, arg);
12981293 return PTR_ERR(ioctl);
12991294 }
13001295
....@@ -1493,7 +1488,7 @@
14931488 ioctl_done:
14941489
14951490 if (err < 0) {
1496
- esas2r_log(ESAS2R_LOG_WARN, "err %d on ioctl cmd %d", err,
1491
+ esas2r_log(ESAS2R_LOG_WARN, "err %d on ioctl cmd %u", err,
14971492 cmd);
14981493
14991494 switch (err) {
....@@ -1515,12 +1510,11 @@
15151510 }
15161511
15171512 /* Always copy the buffer back, if only to pick up the status */
1518
- err = __copy_to_user(arg, ioctl, sizeof(struct atto_express_ioctl));
1513
+ err = copy_to_user(arg, ioctl, sizeof(struct atto_express_ioctl));
15191514 if (err != 0) {
15201515 esas2r_log(ESAS2R_LOG_WARN,
1521
- "ioctl_handler copy_to_user didn't copy "
1522
- "everything (err %d, cmd %d)", err,
1523
- cmd);
1516
+ "ioctl_handler copy_to_user didn't copy everything (err %d, cmd %u)",
1517
+ err, cmd);
15241518 kfree(ioctl);
15251519
15261520 return -EFAULT;
....@@ -1531,7 +1525,7 @@
15311525 return 0;
15321526 }
15331527
1534
-int esas2r_ioctl(struct scsi_device *sd, int cmd, void __user *arg)
1528
+int esas2r_ioctl(struct scsi_device *sd, unsigned int cmd, void __user *arg)
15351529 {
15361530 return esas2r_ioctl_handler(sd->host->hostdata, cmd, arg);
15371531 }
....@@ -1554,11 +1548,10 @@
15541548
15551549 a->firmware.orig_len = length;
15561550
1557
- a->firmware.data = (u8 *)dma_alloc_coherent(&a->pcid->dev,
1558
- (size_t)length,
1559
- (dma_addr_t *)&a->firmware.
1560
- phys,
1561
- GFP_KERNEL);
1551
+ a->firmware.data = dma_alloc_coherent(&a->pcid->dev,
1552
+ (size_t)length,
1553
+ (dma_addr_t *)&a->firmware.phys,
1554
+ GFP_KERNEL);
15621555
15631556 if (!a->firmware.data) {
15641557 esas2r_debug("buffer alloc failed!");
....@@ -1901,11 +1894,11 @@
19011894
19021895 if (!a->vda_buffer) {
19031896 dma_addr_t dma_addr;
1904
- a->vda_buffer = (u8 *)dma_alloc_coherent(&a->pcid->dev,
1905
- (size_t)
1906
- VDA_MAX_BUFFER_SIZE,
1907
- &dma_addr,
1908
- GFP_KERNEL);
1897
+ a->vda_buffer = dma_alloc_coherent(&a->pcid->dev,
1898
+ (size_t)
1899
+ VDA_MAX_BUFFER_SIZE,
1900
+ &dma_addr,
1901
+ GFP_KERNEL);
19091902
19101903 a->ppvda_buffer = dma_addr;
19111904 }
....@@ -2070,11 +2063,10 @@
20702063 re_allocate_buffer:
20712064 a->fs_api_buffer_size = length;
20722065
2073
- a->fs_api_buffer = (u8 *)dma_alloc_coherent(
2074
- &a->pcid->dev,
2075
- (size_t)a->fs_api_buffer_size,
2076
- (dma_addr_t *)&a->ppfs_api_buffer,
2077
- GFP_KERNEL);
2066
+ a->fs_api_buffer = dma_alloc_coherent(&a->pcid->dev,
2067
+ (size_t)a->fs_api_buffer_size,
2068
+ (dma_addr_t *)&a->ppfs_api_buffer,
2069
+ GFP_KERNEL);
20782070 }
20792071 }
20802072