Skip to content

Commit 6856f07

Browse files
basuamdJiri Kosina
authored andcommitted
HID: amd_sfh: Modify and log error only if case of functionality failures
Modify log messages, but only log errors when sensors are missing or a true failure occurs to avoid misleading "failed" messages. Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent 3e78a6c commit 6856f07

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/hid/amd-sfh-hid/amd_sfh_pcie.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,11 @@ static const struct dmi_system_id dmi_nodevs[] = {
333333
static void sfh1_1_init_work(struct work_struct *work)
334334
{
335335
struct amd_mp2_dev *mp2 = container_of(work, struct amd_mp2_dev, work);
336-
struct pci_dev *pdev = mp2->pdev;
337336
int rc;
338337

339338
rc = mp2->sfh1_1_ops->init(mp2);
340-
if (rc) {
341-
dev_err(&pdev->dev, "sfh1_1_init failed err %d\n", rc);
339+
if (rc)
342340
return;
343-
}
344341

345342
amd_sfh_clear_intr(mp2);
346343
mp2->init_done = 1;

drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata)
202202
}
203203

204204
if (!cl_data->is_any_sensor_enabled) {
205-
dev_warn(dev, "Failed to discover, sensors not enabled is %d\n",
205+
dev_warn(dev, "No sensor registered, sensors not enabled is %d\n",
206206
cl_data->is_any_sensor_enabled);
207207
rc = -EOPNOTSUPP;
208208
goto cleanup;
@@ -320,7 +320,7 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
320320

321321
memcpy_fromio(&binfo, mp2->vsbase, sizeof(struct sfh_base_info));
322322
if (binfo.sbase.fw_info.fw_ver == 0 || binfo.sbase.s_list.sl.sensors == 0) {
323-
dev_dbg(dev, "failed to get sensors\n");
323+
dev_dbg(dev, "No sensor registered\n");
324324
return -EOPNOTSUPP;
325325
}
326326
dev_dbg(dev, "firmware version 0x%x\n", binfo.sbase.fw_info.fw_ver);
@@ -337,7 +337,8 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2)
337337
rc = amd_sfh1_1_hid_client_init(mp2);
338338
if (rc) {
339339
sfh_deinit_emp2();
340-
dev_err(dev, "amd_sfh1_1_hid_client_init failed\n");
340+
if ((rc != -ENODEV) && (rc != -EOPNOTSUPP))
341+
dev_err(dev, "amd_sfh1_1_hid_client_init failed\n");
341342
return rc;
342343
}
343344

0 commit comments

Comments
 (0)