Skip to content

Commit 4156f83

Browse files
lixuzhaJiri Kosina
lixuzha
authored and
Jiri Kosina
committed
HID: intel-ish-hid: Use PCI_VDEVICE() and rename device ID macros
Use PCI_VDEVICE() to simplify the device table, and rename these IDs to follow the pattern PCI_DEVICE_ID_INTEL_*; Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Zhang, Lixu <lixu.zhang@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent 3e78a6c commit 4156f83

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎drivers/hid/intel-ish-hid/ipc/hw-ish.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@
1313
#include "hw-ish-regs.h"
1414
#include "ishtp-dev.h"
1515

16-
#define CHV_DEVICE_ID 0x22D8
17-
#define BXT_Ax_DEVICE_ID 0x0AA2
18-
#define BXT_Bx_DEVICE_ID 0x1AA2
19-
#define APL_Ax_DEVICE_ID 0x5AA2
20-
#define SPT_Ax_DEVICE_ID 0x9D35
21-
#define CNL_Ax_DEVICE_ID 0x9DFC
22-
#define GLK_Ax_DEVICE_ID 0x31A2
23-
#define CNL_H_DEVICE_ID 0xA37C
24-
#define ICL_MOBILE_DEVICE_ID 0x34FC
25-
#define SPT_H_DEVICE_ID 0xA135
26-
#define CML_LP_DEVICE_ID 0x02FC
27-
#define CMP_H_DEVICE_ID 0x06FC
28-
#define EHL_Ax_DEVICE_ID 0x4BB3
29-
#define TGL_LP_DEVICE_ID 0xA0FC
30-
#define TGL_H_DEVICE_ID 0x43FC
31-
#define ADL_S_DEVICE_ID 0x7AF8
32-
#define ADL_P_DEVICE_ID 0x51FC
33-
#define ADL_N_DEVICE_ID 0x54FC
34-
#define RPL_S_DEVICE_ID 0x7A78
35-
#define MTL_P_DEVICE_ID 0x7E45
36-
#define ARL_H_DEVICE_ID 0x7745
37-
#define ARL_S_DEVICE_ID 0x7F78
16+
#define PCI_DEVICE_ID_INTEL_ISH_CHV 0x22D8
17+
#define PCI_DEVICE_ID_INTEL_ISH_BXT_Ax 0x0AA2
18+
#define PCI_DEVICE_ID_INTEL_ISH_BXT_Bx 0x1AA2
19+
#define PCI_DEVICE_ID_INTEL_ISH_APL_Ax 0x5AA2
20+
#define PCI_DEVICE_ID_INTEL_ISH_SPT_Ax 0x9D35
21+
#define PCI_DEVICE_ID_INTEL_ISH_CNL_Ax 0x9DFC
22+
#define PCI_DEVICE_ID_INTEL_ISH_GLK_Ax 0x31A2
23+
#define PCI_DEVICE_ID_INTEL_ISH_CNL_H 0xA37C
24+
#define PCI_DEVICE_ID_INTEL_ISH_ICL_MOBILE 0x34FC
25+
#define PCI_DEVICE_ID_INTEL_ISH_SPT_H 0xA135
26+
#define PCI_DEVICE_ID_INTEL_ISH_CML_LP 0x02FC
27+
#define PCI_DEVICE_ID_INTEL_ISH_CMP_H 0x06FC
28+
#define PCI_DEVICE_ID_INTEL_ISH_EHL_Ax 0x4BB3
29+
#define PCI_DEVICE_ID_INTEL_ISH_TGL_LP 0xA0FC
30+
#define PCI_DEVICE_ID_INTEL_ISH_TGL_H 0x43FC
31+
#define PCI_DEVICE_ID_INTEL_ISH_ADL_S 0x7AF8
32+
#define PCI_DEVICE_ID_INTEL_ISH_ADL_P 0x51FC
33+
#define PCI_DEVICE_ID_INTEL_ISH_ADL_N 0x54FC
34+
#define PCI_DEVICE_ID_INTEL_ISH_RPL_S 0x7A78
35+
#define PCI_DEVICE_ID_INTEL_ISH_MTL_P 0x7E45
36+
#define PCI_DEVICE_ID_INTEL_ISH_ARL_H 0x7745
37+
#define PCI_DEVICE_ID_INTEL_ISH_ARL_S 0x7F78
3838

3939
#define REVISION_ID_CHT_A0 0x6
4040
#define REVISION_ID_CHT_Ax_SI 0x0

‎drivers/hid/intel-ish-hid/ipc/ipc.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static bool check_generated_interrupt(struct ishtp_device *dev)
7878
bool interrupt_generated = true;
7979
uint32_t pisr_val = 0;
8080

81-
if (dev->pdev->device == CHV_DEVICE_ID) {
81+
if (dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_CHV) {
8282
pisr_val = ish_reg_read(dev, IPC_REG_PISR_CHV_AB);
8383
interrupt_generated =
8484
IPC_INT_FROM_ISH_TO_HOST_CHV_AB(pisr_val);
@@ -117,7 +117,7 @@ static bool ish_is_input_ready(struct ishtp_device *dev)
117117
*/
118118
static void set_host_ready(struct ishtp_device *dev)
119119
{
120-
if (dev->pdev->device == CHV_DEVICE_ID) {
120+
if (dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_CHV) {
121121
if (dev->pdev->revision == REVISION_ID_CHT_A0 ||
122122
(dev->pdev->revision & REVISION_ID_SI_MASK) ==
123123
REVISION_ID_CHT_Ax_SI)
@@ -909,11 +909,11 @@ static uint32_t ish_ipc_get_header(struct ishtp_device *dev, int length,
909909
*/
910910
static bool _dma_no_cache_snooping(struct ishtp_device *dev)
911911
{
912-
return (dev->pdev->device == EHL_Ax_DEVICE_ID ||
913-
dev->pdev->device == TGL_LP_DEVICE_ID ||
914-
dev->pdev->device == TGL_H_DEVICE_ID ||
915-
dev->pdev->device == ADL_S_DEVICE_ID ||
916-
dev->pdev->device == ADL_P_DEVICE_ID);
912+
return (dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_EHL_Ax ||
913+
dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_TGL_LP ||
914+
dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_TGL_H ||
915+
dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_ADL_S ||
916+
dev->pdev->device == PCI_DEVICE_ID_INTEL_ISH_ADL_P);
917917
}
918918

919919
static const struct ishtp_hw_ops ish_hw_ops = {

‎drivers/hid/intel-ish-hid/ipc/pci-ish.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@
2424
#include "hw-ish.h"
2525

2626
static const struct pci_device_id ish_pci_tbl[] = {
27-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CHV_DEVICE_ID)},
28-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, BXT_Ax_DEVICE_ID)},
29-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, BXT_Bx_DEVICE_ID)},
30-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, APL_Ax_DEVICE_ID)},
31-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_Ax_DEVICE_ID)},
32-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)},
33-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)},
34-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)},
35-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)},
36-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},
37-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)},
38-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CMP_H_DEVICE_ID)},
39-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
40-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)},
41-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)},
42-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_S_DEVICE_ID)},
43-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_P_DEVICE_ID)},
44-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_N_DEVICE_ID)},
45-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, RPL_S_DEVICE_ID)},
46-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, MTL_P_DEVICE_ID)},
47-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ARL_H_DEVICE_ID)},
48-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ARL_S_DEVICE_ID)},
49-
{0, }
27+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_CHV)},
28+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_BXT_Ax)},
29+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_BXT_Bx)},
30+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_APL_Ax)},
31+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_SPT_Ax)},
32+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_CNL_Ax)},
33+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_GLK_Ax)},
34+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_CNL_H)},
35+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ICL_MOBILE)},
36+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_SPT_H)},
37+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_CML_LP)},
38+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_CMP_H)},
39+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_EHL_Ax)},
40+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_TGL_LP)},
41+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_TGL_H)},
42+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ADL_S)},
43+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ADL_P)},
44+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ADL_N)},
45+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_RPL_S)},
46+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_MTL_P)},
47+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ARL_H)},
48+
{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ISH_ARL_S)},
49+
{}
5050
};
5151
MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
5252

@@ -105,19 +105,19 @@ static int ish_init(struct ishtp_device *dev)
105105

106106
static const struct pci_device_id ish_invalid_pci_ids[] = {
107107
/* Mehlow platform special pci ids */
108-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xA309)},
109-
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xA30A)},
108+
{PCI_VDEVICE(INTEL, 0xA309)},
109+
{PCI_VDEVICE(INTEL, 0xA30A)},
110110
{}
111111
};
112112

113113
static inline bool ish_should_enter_d0i3(struct pci_dev *pdev)
114114
{
115-
return !pm_suspend_via_firmware() || pdev->device == CHV_DEVICE_ID;
115+
return !pm_suspend_via_firmware() || pdev->device == PCI_DEVICE_ID_INTEL_ISH_CHV;
116116
}
117117

118118
static inline bool ish_should_leave_d0i3(struct pci_dev *pdev)
119119
{
120-
return !pm_resume_via_firmware() || pdev->device == CHV_DEVICE_ID;
120+
return !pm_resume_via_firmware() || pdev->device == PCI_DEVICE_ID_INTEL_ISH_CHV;
121121
}
122122

123123
/**
@@ -189,7 +189,7 @@ static int ish_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
189189
init_waitqueue_head(&ishtp->resume_wait);
190190

191191
/* Enable PME for EHL */
192-
if (pdev->device == EHL_Ax_DEVICE_ID)
192+
if (pdev->device == PCI_DEVICE_ID_INTEL_ISH_EHL_Ax)
193193
device_init_wakeup(dev, true);
194194

195195
ret = ish_init(ishtp);
@@ -222,7 +222,7 @@ static void ish_remove(struct pci_dev *pdev)
222222
*/
223223
static void ish_shutdown(struct pci_dev *pdev)
224224
{
225-
if (pdev->device == EHL_Ax_DEVICE_ID)
225+
if (pdev->device == PCI_DEVICE_ID_INTEL_ISH_EHL_Ax)
226226
pci_prepare_to_sleep(pdev);
227227
}
228228

0 commit comments

Comments
 (0)