Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firmware: replace HOTPLUG with UEVENT in FW_ACTION defines

With commit 312c004d36ce ("[PATCH] driver core: replace "hotplug" by
"uevent"") already in the tree over a decade, update the name of
FW_ACTION defines to follow semantics, and reflect what the defines are
really meant for, i.e. whether or not generate user space event.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Link: https://lore.kernel.org/r/20210425020024.28057-1-shawn.guo@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Shawn Guo and committed by
Greg Kroah-Hartman
0733d839 6efb943b

+19 -19
+1 -1
drivers/dma/imx-sdma.c
··· 1829 1829 int ret; 1830 1830 1831 1831 ret = request_firmware_nowait(THIS_MODULE, 1832 - FW_ACTION_HOTPLUG, fw_name, sdma->dev, 1832 + FW_ACTION_UEVENT, fw_name, sdma->dev, 1833 1833 GFP_KERNEL, sdma, sdma_load_firmware); 1834 1834 1835 1835 return ret;
+1 -1
drivers/media/platform/exynos4-is/fimc-is.c
··· 436 436 static int fimc_is_request_firmware(struct fimc_is *is, const char *fw_name) 437 437 { 438 438 return request_firmware_nowait(THIS_MODULE, 439 - FW_ACTION_HOTPLUG, fw_name, &is->pdev->dev, 439 + FW_ACTION_UEVENT, fw_name, &is->pdev->dev, 440 440 GFP_KERNEL, is, fimc_is_load_firmware); 441 441 } 442 442
+1 -1
drivers/mfd/iqs62x.c
··· 998 998 999 999 device_property_read_string(&client->dev, "firmware-name", &fw_name); 1000 1000 1001 - ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 1001 + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 1002 1002 fw_name ? : iqs62x->dev_desc->fw_name, 1003 1003 &client->dev, GFP_KERNEL, iqs62x, 1004 1004 iqs62x_firmware_load);
+1 -1
drivers/misc/lattice-ecp3-config.c
··· 198 198 spi_set_drvdata(spi, data); 199 199 200 200 init_completion(&data->fw_loaded); 201 - err = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 201 + err = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 202 202 FIRMWARE_NAME, &spi->dev, 203 203 GFP_KERNEL, spi, firmware_load); 204 204 if (err) {
+1 -1
drivers/net/wireless/ti/wlcore/main.c
··· 6784 6784 6785 6785 if (pdev_data->family && pdev_data->family->nvs_name) { 6786 6786 nvs_name = pdev_data->family->nvs_name; 6787 - ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 6787 + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 6788 6788 nvs_name, &pdev->dev, GFP_KERNEL, 6789 6789 wl, wlcore_nvs_cb); 6790 6790 if (ret < 0) {
+1 -1
drivers/platform/x86/dell/dell_rbu.c
··· 573 573 if (!rbu_data.entry_created) { 574 574 spin_unlock(&rbu_data.lock); 575 575 req_firm_rc = request_firmware_nowait(THIS_MODULE, 576 - FW_ACTION_NOHOTPLUG, "dell_rbu", 576 + FW_ACTION_NOUEVENT, "dell_rbu", 577 577 &rbu_device->dev, GFP_KERNEL, &context, 578 578 callbackfn_rbu); 579 579 if (req_firm_rc) {
+1 -1
drivers/remoteproc/remoteproc_core.c
··· 1788 1788 * We're initiating an asynchronous firmware loading, so we can 1789 1789 * be built-in kernel code, without hanging the boot process. 1790 1790 */ 1791 - ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 1791 + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 1792 1792 rproc->firmware, &rproc->dev, GFP_KERNEL, 1793 1793 rproc, rproc_auto_boot_callback); 1794 1794 if (ret < 0)
+1 -1
drivers/scsi/lpfc/lpfc_init.c
··· 13051 13051 snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", phba->ModelName); 13052 13052 13053 13053 if (fw_upgrade == INT_FW_UPGRADE) { 13054 - ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 13054 + ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 13055 13055 file_name, &phba->pcidev->dev, 13056 13056 GFP_KERNEL, (void *)phba, 13057 13057 lpfc_write_firmware);
+1 -1
drivers/tty/serial/ucc_uart.c
··· 1227 1227 * kernel, then we use it. 1228 1228 */ 1229 1229 ret = request_firmware_nowait(THIS_MODULE, 1230 - FW_ACTION_HOTPLUG, filename, &ofdev->dev, 1230 + FW_ACTION_UEVENT, filename, &ofdev->dev, 1231 1231 GFP_KERNEL, &ofdev->dev, uart_firmware_cont); 1232 1232 if (ret) { 1233 1233 dev_err(&ofdev->dev,
+2 -2
include/linux/firmware.h
··· 6 6 #include <linux/compiler.h> 7 7 #include <linux/gfp.h> 8 8 9 - #define FW_ACTION_NOHOTPLUG 0 10 - #define FW_ACTION_HOTPLUG 1 9 + #define FW_ACTION_NOUEVENT 0 10 + #define FW_ACTION_UEVENT 1 11 11 12 12 struct firmware { 13 13 size_t size;
+5 -5
lib/test_firmware.c
··· 260 260 len += scnprintf(buf + len, PAGE_SIZE - len, 261 261 "send_uevent:\t\t%s\n", 262 262 test_fw_config->send_uevent ? 263 - "FW_ACTION_HOTPLUG" : 264 - "FW_ACTION_NOHOTPLUG"); 263 + "FW_ACTION_UEVENT" : 264 + "FW_ACTION_NOUEVENT"); 265 265 len += scnprintf(buf + len, PAGE_SIZE - len, 266 266 "into_buf:\t\t%s\n", 267 267 test_fw_config->into_buf ? "true" : "false"); ··· 729 729 mutex_lock(&test_fw_mutex); 730 730 release_firmware(test_firmware); 731 731 test_firmware = NULL; 732 - rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG, name, 732 + rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOUEVENT, name, 733 733 dev, GFP_KERNEL, NULL, 734 734 trigger_async_request_cb); 735 735 if (rc) { ··· 938 938 pr_info("batched loading '%s' custom fallback mechanism %u times\n", 939 939 test_fw_config->name, test_fw_config->num_requests); 940 940 941 - send_uevent = test_fw_config->send_uevent ? FW_ACTION_HOTPLUG : 942 - FW_ACTION_NOHOTPLUG; 941 + send_uevent = test_fw_config->send_uevent ? FW_ACTION_UEVENT : 942 + FW_ACTION_NOUEVENT; 943 943 944 944 for (i = 0; i < test_fw_config->num_requests; i++) { 945 945 req = &test_fw_config->reqs[i];
+3 -3
sound/soc/codecs/wm8958-dsp2.c
··· 912 912 913 913 914 914 /* We don't *require* firmware and don't want to delay boot */ 915 - request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 915 + request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 916 916 "wm8958_mbc.wfw", component->dev, GFP_KERNEL, 917 917 component, wm8958_mbc_loaded); 918 - request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 918 + request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 919 919 "wm8958_mbc_vss.wfw", component->dev, GFP_KERNEL, 920 920 component, wm8958_mbc_vss_loaded); 921 - request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, 921 + request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, 922 922 "wm8958_enh_eq.wfw", component->dev, GFP_KERNEL, 923 923 component, wm8958_enh_eq_loaded); 924 924