Skip to content

Commit 2627c99

Browse files
committed
cxl/pci: Remove inconsistent usage of dev_err_probe()
If dev_err_probe() is to be used it should at least be used consistently within the same function. It is also worth questioning whether every potential -ENOMEM needs an explicit error message. Remove the cxl_setup_fw_upload() error prints for what are rare / hardware-independent failures. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 08b8a8c commit 2627c99

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

drivers/cxl/core/memdev.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -970,25 +970,16 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds)
970970
struct cxl_dev_state *cxlds = &mds->cxlds;
971971
struct device *dev = &cxlds->cxlmd->dev;
972972
struct fw_upload *fwl;
973-
int rc;
974973

975974
if (!test_bit(CXL_MEM_COMMAND_ID_GET_FW_INFO, mds->enabled_cmds))
976975
return 0;
977976

978977
fwl = firmware_upload_register(THIS_MODULE, dev, dev_name(dev),
979978
&cxl_memdev_fw_ops, mds);
980979
if (IS_ERR(fwl))
981-
return dev_err_probe(dev, PTR_ERR(fwl),
982-
"Failed to register firmware loader\n");
983-
984-
rc = devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload,
985-
fwl);
986-
if (rc)
987-
dev_err(dev,
988-
"Failed to add firmware loader remove action: %d\n",
989-
rc);
980+
return PTR_ERR(fwl);
990981

991-
return rc;
982+
return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl);
992983
}
993984
EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL);
994985

0 commit comments

Comments
 (0)