drivers/perf: thunderx2_pmu: Replace open coded acpi_match_device()
PATCH 1/1 drivers/perf: thunderx2_pmu: Replace open coded acpi_match_device()
Replace open coded acpi_match_device() in get_tx2_pmu_type().
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/perf/thunderx2_pmu.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/perf/thunderx2_pmu.c +7 -12
@@ -504,24 +504,19 @@ static void tx2_uncore_event_update(struct perf_event *event)static enum tx2_uncore_type get_tx2_pmu_type (struct acpi_device *adev) { -int i =0 ; -struct acpi_tx2_pmu_device { -__u8 id[ACPI_ID_LEN ]; -enum tx2_uncore_type type; - } devices[] = { +struct acpi_device_id devices[] = { {"CAV901D" ,PMU_TYPE_L3C }, {"CAV901F" ,PMU_TYPE_DMC }, {"CAV901E" ,PMU_TYPE_CCPI2 }, - {"" ,PMU_TYPE_INVALID } + {} }; +const struct acpi_device_id *id; -while (devices[i].type !=PMU_TYPE_INVALID ) { -if (!strcmp (acpi_device_hid (adev), devices[i].id)) -break ; - i++; - } + id =acpi_match_device (adev, devices); +if (!id) +return PMU_TYPE_INVALID ; -return devices[i].type; +return (enum tx2_uncore_type )id->driver_data; } static bool tx2_uncore_validate_event(struct pmu *pmu,
Signature · 1 line
2.35.1
Will Deacon
maintainerQuoted 30 lines · Andy Shevchenko
Replace open coded
acpi_match_device()inget_tx2_pmu_type().Signed-off-by Andy Shevchenko <[email protected]>--- drivers/perf/thunderx2_pmu.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)drivers/perf/thunderx2_pmu.c +3
-7@@ -504,24 +504,19 @@ static void tx2_uncore_event_update(struct perf_event *event)static enum tx2_uncore_type get_tx2_pmu_type (struct acpi_device *adev) { -int i =0 ; -struct acpi_tx2_pmu_device { -__u8 id[ACPI_ID_LEN ]; -enum tx2_uncore_type type; - } devices[] = { +struct acpi_device_id devices[] = { {"CAV901D" ,PMU_TYPE_L3C }, {"CAV901F" ,PMU_TYPE_DMC }, {"CAV901E" ,PMU_TYPE_CCPI2 }, - {"" ,PMU_TYPE_INVALID } + {} }; +const struct acpi_device_id *id; -while (devices[i].type !=PMU_TYPE_INVALID ) {
drivers/perf/thunderx2_pmu.c static void tx2_uncore_event_update(struct perf_event *event) · line 519
Quoted 10 lines
drivers/perf/thunderx2_pmu.c +4
-5-if (!strcmp (acpi_device_hid (adev), devices[i].id)) -break ; - i++; - } + id =acpi_match_device (adev, devices); +if (!id) +return PMU_TYPE_INVALID ; -return devices[i].type; +return (enum tx2_uncore_type )id->driver_data;
This doesn't even build for me:
| drivers/perf/thunderx2_pmu.c:515:25: error: incompatible pointer types passing 'struct acpi_device *' to parameter of type 'const struct acpi_device_id *' [-Werror,-Wincompatible-pointer-types] | id = acpi_match_device(adev, devices); | ^~~~ | ./include/linux/acpi.h:713:77: note: passing argument to parameter 'ids' here | const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, | ^ | drivers/perf/thunderx2_pmu.c:515:31: error: incompatible pointer types passing 'struct acpi_device_id [4]' to parameter of type 'const struct device *' [-Werror,-Wincompatible-pointer-types] | id = acpi_match_device(adev, devices); | ^~~~~~~ | ./include/linux/acpi.h:714:34: note: passing argument to parameter 'dev' here | const struct device *dev); | ^ | 2 errors generated. | make[2]: *** [scripts/Makefile.build:249: drivers/perf/thunderx2_pmu.o] Error 1 | make[2]: *** Waiting for unfinished jobs.... | make[1]: *** [scripts/Makefile.build:466: drivers/perf] Error 2 | make[1]: *** Waiting for unfinished jobs.... | make: *** [Makefile:1843: drivers] Error 2 |
Have you tested this at all?
Will
Quoted 4 lines · Will Deacon
Quoted 1 line · Andy Shevchenko
Replace open coded
acpi_match_device()inget_tx2_pmu_type().This doesn't even build for me:
Neither to me :-(
Quoted 1 line
Have you tested this at all?
It was a last minute change from __acpi_match_device() to acpi_match_device() where arguments were swapped and obviously this wasn't properly tested, sorry.
Signature · 2 lines
With Best Regards, Andy Shevchenko