Now that the firmware loader properly ceases all operations at
firmware_upload_unregister() and no longer takes module references, clean
up the unused parameter.
Cc: Chao Gao <chao.gao@intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Russ Weight <russ.weight@linux.dev>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
Documentation/driver-api/firmware/fw_upload.rst | 2 +-
include/linux/firmware.h | 15 +++++++--------
drivers/base/firmware_loader/sysfs_upload.c | 9 ++++-----
drivers/cxl/core/memdev.c | 4 ++--
drivers/firmware/microchip/mpfs-auto-update.c | 2 +-
drivers/fpga/intel-m10-bmc-sec-update.c | 4 ++--
drivers/greybus/gb-beagleplay.c | 2 +-
drivers/media/i2c/thp7312.c | 2 +-
drivers/net/pse-pd/pd692x0.c | 4 ++--
lib/test_firmware.c | 3 +--
10 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/Documentation/driver-api/firmware/fw_upload.rst b/Documentation/driver-api/firmware/fw_upload.rst
index edf1d0c5e7c3..702b1ed77551 100644
--- a/Documentation/driver-api/firmware/fw_upload.rst
+++ b/Documentation/driver-api/firmware/fw_upload.rst
@@ -57,7 +57,7 @@ function calls firmware_upload_unregister() such as::
len = (truncate) ? truncate - fw_name : strlen(fw_name);
sec->fw_name = kmemdup_nul(fw_name, len, GFP_KERNEL);
- fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name,
+ fwl = firmware_upload_register(sec->dev, sec->fw_name,
&m10bmc_ops, sec);
if (IS_ERR(fwl)) {
dev_err(sec->dev, "Firmware Upload driver failed to start\n");
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index aae1b85ffc10..1cda26ef2d8d 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -187,20 +187,19 @@ static inline int request_partial_firmware_into_buf
#ifdef CONFIG_FW_UPLOAD
-struct fw_upload *
-firmware_upload_register(struct module *module, struct device *parent,
- const char *name, const struct fw_upload_ops *ops,
- void *dd_handle);
+struct fw_upload *firmware_upload_register(struct device *parent,
+ const char *name,
+ const struct fw_upload_ops *ops,
+ void *dd_handle);
void firmware_upload_unregister(struct fw_upload *fw_upload);
#else
static inline struct fw_upload *
-firmware_upload_register(struct module *module, struct device *parent,
- const char *name, const struct fw_upload_ops *ops,
- void *dd_handle)
+firmware_upload_register(struct device *parent, const char *name,
+ const struct fw_upload_ops *ops, void *dd_handle)
{
- return ERR_PTR(-EINVAL);
+ return ERR_PTR(-EINVAL);
}
static inline void firmware_upload_unregister(struct fw_upload *fw_upload)
diff --git a/drivers/base/firmware_loader/sysfs_upload.c b/drivers/base/firmware_loader/sysfs_upload.c
index 23f6cdaf29c5..e0cf4c55b520 100644
--- a/drivers/base/firmware_loader/sysfs_upload.c
+++ b/drivers/base/firmware_loader/sysfs_upload.c
@@ -274,7 +274,6 @@ void fw_upload_free(struct fw_sysfs *fw_sysfs)
/**
* firmware_upload_register() - register for the firmware upload sysfs API
- * @module: kernel module of this device
* @parent: parent device instantiating firmware upload
* @name: firmware name to be associated with this device
* @ops: pointer to structure of firmware upload ops
@@ -286,10 +285,10 @@ void fw_upload_free(struct fw_sysfs *fw_sysfs)
* Return: struct fw_upload pointer or ERR_PTR()
*
**/
-struct fw_upload *
-firmware_upload_register(struct module *module, struct device *parent,
- const char *name, const struct fw_upload_ops *ops,
- void *dd_handle)
+struct fw_upload *firmware_upload_register(struct device *parent,
+ const char *name,
+ const struct fw_upload_ops *ops,
+ void *dd_handle)
{
u32 opt_flags = FW_OPT_NOCACHE;
struct fw_upload *fw_upload;
diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c
index 273c22118d3d..79c2ca393cbc 100644
--- a/drivers/cxl/core/memdev.c
+++ b/drivers/cxl/core/memdev.c
@@ -1045,8 +1045,8 @@ int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds)
if (!test_bit(CXL_MEM_COMMAND_ID_GET_FW_INFO, cxl_mbox->enabled_cmds))
return 0;
- fwl = firmware_upload_register(THIS_MODULE, dev, dev_name(dev),
- &cxl_memdev_fw_ops, mds);
+ fwl = firmware_upload_register(dev, dev_name(dev), &cxl_memdev_fw_ops,
+ mds);
if (IS_ERR(fwl))
return PTR_ERR(fwl);
return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl);
diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 46b19d803446..9b25787467f0 100644
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -435,7 +435,7 @@ static int mpfs_auto_update_probe(struct platform_device *pdev)
return dev_err_probe(dev, ret,
"The current bitstream does not support auto-update\n");
- fw_uploader = firmware_upload_register(THIS_MODULE, dev, "mpfs-auto-update",
+ fw_uploader = firmware_upload_register(dev, "mpfs-auto-update",
&mpfs_auto_update_ops, priv);
if (IS_ERR(fw_uploader))
return dev_err_probe(dev, PTR_ERR(fw_uploader),
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index 10f678b9ed36..1dfa0b7019b0 100644
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -713,8 +713,8 @@ static int m10bmc_sec_probe(struct platform_device *pdev)
goto fw_name_fail;
}
- fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name,
- &m10bmc_ops, sec);
+ fwl = firmware_upload_register(sec->dev, sec->fw_name, &m10bmc_ops,
+ sec);
if (IS_ERR(fwl)) {
dev_err(sec->dev, "Firmware Upload driver failed to start\n");
ret = PTR_ERR(fwl);
diff --git a/drivers/greybus/gb-beagleplay.c b/drivers/greybus/gb-beagleplay.c
index 87186f891a6a..eceffffea829 100644
--- a/drivers/greybus/gb-beagleplay.c
+++ b/drivers/greybus/gb-beagleplay.c
@@ -1067,7 +1067,7 @@ static int gb_fw_init(struct gb_beagleplay *bg)
return PTR_ERR(desc);
bg->rst_gpio = desc;
- fwl = firmware_upload_register(THIS_MODULE, &bg->sd->dev, "cc1352p7",
+ fwl = firmware_upload_register(&bg->sd->dev, "cc1352p7",
&cc1352_bootloader_ops, bg);
if (IS_ERR(fwl))
return PTR_ERR(fwl);
diff --git a/drivers/media/i2c/thp7312.c b/drivers/media/i2c/thp7312.c
index 775cfba188d8..ebbe14393c9f 100644
--- a/drivers/media/i2c/thp7312.c
+++ b/drivers/media/i2c/thp7312.c
@@ -1909,7 +1909,7 @@ static int thp7312_register_flash_mode(struct thp7312_device *thp7312)
goto error;
}
- fwl = firmware_upload_register(THIS_MODULE, dev, "thp7312-firmware",
+ fwl = firmware_upload_register(dev, "thp7312-firmware",
&thp7312_fw_upload_ops, thp7312);
if (IS_ERR(fwl)) {
ret = PTR_ERR(fwl);
diff --git a/drivers/net/pse-pd/pd692x0.c b/drivers/net/pse-pd/pd692x0.c
index 4a3c852780f5..7463f7d81201 100644
--- a/drivers/net/pse-pd/pd692x0.c
+++ b/drivers/net/pse-pd/pd692x0.c
@@ -1834,8 +1834,8 @@ static int pd692x0_i2c_probe(struct i2c_client *client)
return dev_err_probe(dev, ret,
"failed to register PSE controller\n");
- fwl = firmware_upload_register(THIS_MODULE, dev, dev_name(dev),
- &pd692x0_fw_ops, priv);
+ fwl = firmware_upload_register(dev, dev_name(dev), &pd692x0_fw_ops,
+ priv);
if (IS_ERR(fwl))
return dev_err_probe(dev, PTR_ERR(fwl),
"failed to register to the Firmware Upload API\n");
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index b471d720879a..cfe5475d9d18 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -1322,8 +1322,7 @@ static ssize_t upload_register_store(struct device *dev,
goto free_tst;
}
- fwl = firmware_upload_register(THIS_MODULE, dev, tst->name,
- &upload_test_ops, tst);
+ fwl = firmware_upload_register(dev, tst->name, &upload_test_ops, tst);
if (IS_ERR(fwl)) {
ret = PTR_ERR(fwl);
goto free_buf;
--
2.53.0© 2016 - 2026 Red Hat, Inc.