| From 082b196d3a09bf226a5a671fe57cc8786dd6d2c3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 28 Jan 2021 13:12:17 +0100 |
| Subject: AMD_SFH: Removed unused activecontrolstatus member from the |
| amd_mp2_dev struct |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit a9e54f4b62dcfed4432a5a89b1cd5903737f6e83 ] |
| |
| This value is only used once inside amd_mp2_get_sensor_num(), |
| so there is no need to store this in the amd_mp2_dev struct, |
| amd_mp2_get_sensor_num() can simple use a local variable for this. |
| |
| Fixes: 4f567b9f8141 ("SFH: PCIe driver to add support of AMD sensor fusion hub") |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Acked-by: Sandeep Singh <sandeep.singh@amd.com |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 6 ++++-- |
| drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 - |
| 2 files changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c |
| index dbac16641662..f3cdb4ea33da 100644 |
| --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c |
| +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c |
| @@ -76,9 +76,11 @@ void amd_stop_all_sensors(struct amd_mp2_dev *privdata) |
| int amd_mp2_get_sensor_num(struct amd_mp2_dev *privdata, u8 *sensor_id) |
| { |
| int activestatus, num_of_sensors = 0; |
| + u32 activecontrolstatus; |
| + |
| + activecontrolstatus = readl(privdata->mmio + AMD_P2C_MSG3); |
| + activestatus = activecontrolstatus >> 4; |
| |
| - privdata->activecontrolstatus = readl(privdata->mmio + AMD_P2C_MSG3); |
| - activestatus = privdata->activecontrolstatus >> 4; |
| if (ACEL_EN & activestatus) |
| sensor_id[num_of_sensors++] = accel_idx; |
| |
| diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h |
| index 8f8d19b2cfe5..489415f7c22c 100644 |
| --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h |
| +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h |
| @@ -61,7 +61,6 @@ struct amd_mp2_dev { |
| struct pci_dev *pdev; |
| struct amdtp_cl_data *cl_data; |
| void __iomem *mmio; |
| - u32 activecontrolstatus; |
| }; |
| |
| struct amd_mp2_sensor_info { |
| -- |
| 2.30.2 |
| |