Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firmware: replace HOTPLUG with UEVENT in FW_ACTION defines

Browse Source 
With commit 312c004d36 ("[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>
This commit is contained in:
Shawn Guo 2021-04-25 10:00:24 +08:00 committed by Greg Kroah-Hartman
parent 6efb943b86
commit 0733d83905
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/imx-sdma.c
View File

@ -1829,7 +1829,7 @@ static int sdma_get_firmware(struct sdma_engine *sdma,
int ret; int ret;
ret = request_firmware_nowait(THIS_MODULE, ret = request_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG, fw_name, sdma->dev, FW_ACTION_UEVENT, fw_name, sdma->dev,
GFP_KERNEL, sdma, sdma_load_firmware); GFP_KERNEL, sdma, sdma_load_firmware);
return ret; return ret;

2
drivers/media/platform/exynos4-is/fimc-is.c
View File

@ -436,7 +436,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context)
static int fimc_is_request_firmware(struct fimc_is *is, const char *fw_name) static int fimc_is_request_firmware(struct fimc_is *is, const char *fw_name)
{ {
return request_firmware_nowait(THIS_MODULE, return request_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG, fw_name, &is->pdev->dev, FW_ACTION_UEVENT, fw_name, &is->pdev->dev,
GFP_KERNEL, is, fimc_is_load_firmware); GFP_KERNEL, is, fimc_is_load_firmware);
} }

2
drivers/mfd/iqs62x.c
View File

@ -998,7 +998,7 @@ static int iqs62x_probe(struct i2c_client *client)
device_property_read_string(&client->dev, "firmware-name", &fw_name); device_property_read_string(&client->dev, "firmware-name", &fw_name);
ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
fw_name ? : iqs62x->dev_desc->fw_name, fw_name ? : iqs62x->dev_desc->fw_name,
&client->dev, GFP_KERNEL, iqs62x, &client->dev, GFP_KERNEL, iqs62x,
iqs62x_firmware_load); iqs62x_firmware_load);

2
drivers/misc/lattice-ecp3-config.c
View File

@ -198,7 +198,7 @@ static int lattice_ecp3_probe(struct spi_device *spi)
spi_set_drvdata(spi, data); spi_set_drvdata(spi, data);
init_completion(&data->fw_loaded); init_completion(&data->fw_loaded);
err = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, err = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
FIRMWARE_NAME, &spi->dev, FIRMWARE_NAME, &spi->dev,
GFP_KERNEL, spi, firmware_load); GFP_KERNEL, spi, firmware_load);
if (err) { if (err) {

2
drivers/net/wireless/ti/wlcore/main.c
View File

@ -6784,7 +6784,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
if (pdev_data->family && pdev_data->family->nvs_name) { if (pdev_data->family && pdev_data->family->nvs_name) {
nvs_name = pdev_data->family->nvs_name; nvs_name = pdev_data->family->nvs_name;
ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
nvs_name, &pdev->dev, GFP_KERNEL, nvs_name, &pdev->dev, GFP_KERNEL,
wl, wlcore_nvs_cb); wl, wlcore_nvs_cb);
if (ret < 0) { if (ret < 0) {

2
drivers/platform/x86/dell/dell_rbu.c
View File

@ -573,7 +573,7 @@ static ssize_t image_type_write(struct file *filp, struct kobject *kobj,
if (!rbu_data.entry_created) { if (!rbu_data.entry_created) {
spin_unlock(&rbu_data.lock); spin_unlock(&rbu_data.lock);
req_firm_rc = request_firmware_nowait(THIS_MODULE, req_firm_rc = request_firmware_nowait(THIS_MODULE,
FW_ACTION_NOHOTPLUG, "dell_rbu", FW_ACTION_NOUEVENT, "dell_rbu",
&rbu_device->dev, GFP_KERNEL, &context, &rbu_device->dev, GFP_KERNEL, &context,
callbackfn_rbu); callbackfn_rbu);
if (req_firm_rc) { if (req_firm_rc) {

2
drivers/remoteproc/remoteproc_core.c
View File

@ -1788,7 +1788,7 @@ static int rproc_trigger_auto_boot(struct rproc *rproc)
* We're initiating an asynchronous firmware loading, so we can * We're initiating an asynchronous firmware loading, so we can
* be built-in kernel code, without hanging the boot process. * be built-in kernel code, without hanging the boot process.
*/ */
ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
rproc->firmware, &rproc->dev, GFP_KERNEL, rproc->firmware, &rproc->dev, GFP_KERNEL,
rproc, rproc_auto_boot_callback); rproc, rproc_auto_boot_callback);
if (ret < 0) if (ret < 0)

2
drivers/scsi/lpfc/lpfc_init.c
View File

@ -13051,7 +13051,7 @@ lpfc_sli4_request_firmware_update(struct lpfc_hba *phba, uint8_t fw_upgrade)
snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", phba->ModelName); snprintf(file_name, ELX_MODEL_NAME_SIZE, "%s.grp", phba->ModelName);
if (fw_upgrade == INT_FW_UPGRADE) { if (fw_upgrade == INT_FW_UPGRADE) {
ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
file_name, &phba->pcidev->dev, file_name, &phba->pcidev->dev,
GFP_KERNEL, (void *)phba, GFP_KERNEL, (void *)phba,
lpfc_write_firmware); lpfc_write_firmware);

2
drivers/tty/serial/ucc_uart.c
View File

@ -1227,7 +1227,7 @@ static int soft_uart_init(struct platform_device *ofdev)
* kernel, then we use it. * kernel, then we use it.
*/ */
ret = request_firmware_nowait(THIS_MODULE, ret = request_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG, filename, &ofdev->dev, FW_ACTION_UEVENT, filename, &ofdev->dev,
GFP_KERNEL, &ofdev->dev, uart_firmware_cont); GFP_KERNEL, &ofdev->dev, uart_firmware_cont);
if (ret) { if (ret) {
dev_err(&ofdev->dev, dev_err(&ofdev->dev,

4
include/linux/firmware.h
View File

@ -6,8 +6,8 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#define FW_ACTION_NOHOTPLUG 0 #define FW_ACTION_NOUEVENT 0
#define FW_ACTION_HOTPLUG 1 #define FW_ACTION_UEVENT 1
struct firmware { struct firmware {
size_t size; size_t size;

10
lib/test_firmware.c
View File

@ -260,8 +260,8 @@ static ssize_t config_show(struct device *dev,
len += scnprintf(buf + len, PAGE_SIZE - len, len += scnprintf(buf + len, PAGE_SIZE - len,
"send_uevent:\t\t%s\n", "send_uevent:\t\t%s\n",
test_fw_config->send_uevent ? test_fw_config->send_uevent ?
"FW_ACTION_HOTPLUG" : "FW_ACTION_UEVENT" :
"FW_ACTION_NOHOTPLUG"); "FW_ACTION_NOUEVENT");
len += scnprintf(buf + len, PAGE_SIZE - len, len += scnprintf(buf + len, PAGE_SIZE - len,
"into_buf:\t\t%s\n", "into_buf:\t\t%s\n",
test_fw_config->into_buf ? "true" : "false"); test_fw_config->into_buf ? "true" : "false");
@ -729,7 +729,7 @@ static ssize_t trigger_custom_fallback_store(struct device *dev,
mutex_lock(&test_fw_mutex); mutex_lock(&test_fw_mutex);
release_firmware(test_firmware); release_firmware(test_firmware);
test_firmware = NULL; test_firmware = NULL;
rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG, name, rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOUEVENT, name,
dev, GFP_KERNEL, NULL, dev, GFP_KERNEL, NULL,
trigger_async_request_cb); trigger_async_request_cb);
if (rc) { if (rc) {
@ -938,8 +938,8 @@ ssize_t trigger_batched_requests_async_store(struct device *dev,
pr_info("batched loading '%s' custom fallback mechanism %u times\n", pr_info("batched loading '%s' custom fallback mechanism %u times\n",
test_fw_config->name, test_fw_config->num_requests); test_fw_config->name, test_fw_config->num_requests);
send_uevent = test_fw_config->send_uevent ? FW_ACTION_HOTPLUG : send_uevent = test_fw_config->send_uevent ? FW_ACTION_UEVENT :
FW_ACTION_NOHOTPLUG; FW_ACTION_NOUEVENT;
for (i = 0; i < test_fw_config->num_requests; i++) { for (i = 0; i < test_fw_config->num_requests; i++) {
req = &test_fw_config->reqs[i]; req = &test_fw_config->reqs[i];

6
sound/soc/codecs/wm8958-dsp2.c
View File

@ -912,13 +912,13 @@ void wm8958_dsp2_init(struct snd_soc_component *component)
/* We don't *require* firmware and don't want to delay boot */ /* We don't *require* firmware and don't want to delay boot */
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
"wm8958_mbc.wfw", component->dev, GFP_KERNEL, "wm8958_mbc.wfw", component->dev, GFP_KERNEL,
component, wm8958_mbc_loaded); component, wm8958_mbc_loaded);
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
"wm8958_mbc_vss.wfw", component->dev, GFP_KERNEL, "wm8958_mbc_vss.wfw", component->dev, GFP_KERNEL,
component, wm8958_mbc_vss_loaded); component, wm8958_mbc_vss_loaded);
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT,
"wm8958_enh_eq.wfw", component->dev, GFP_KERNEL, "wm8958_enh_eq.wfw", component->dev, GFP_KERNEL,
component, wm8958_enh_eq_loaded); component, wm8958_enh_eq_loaded);