| Message ID | 20210425020024.28057-1-shawn.guo@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | firmware: replace HOTPLUG with UEVENT in FW_ACTION defines | expand |
On Sun, Apr 25, 2021 at 10:00:24AM +0800, Shawn Guo wrote: > 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. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > drivers/dma/imx-sdma.c | 2 +- > drivers/media/platform/exynos4-is/fimc-is.c | 2 +- > drivers/mfd/iqs62x.c | 2 +- > drivers/misc/lattice-ecp3-config.c | 2 +- > drivers/net/wireless/ti/wlcore/main.c | 2 +- > drivers/platform/x86/dell/dell_rbu.c | 2 +- > drivers/remoteproc/remoteproc_core.c | 2 +- > drivers/scsi/lpfc/lpfc_init.c | 2 +- > drivers/tty/serial/ucc_uart.c | 2 +- > include/linux/firmware.h | 4 ++-- > lib/test_firmware.c | 10 +++++----- > sound/soc/codecs/wm8958-dsp2.c | 6 +++--- > 12 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index d5590c08db51..e2b559945c11 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -1829,7 +1829,7 @@ static int sdma_get_firmware(struct sdma_engine *sdma, > int ret; > > ret = request_firmware_nowait(THIS_MODULE, > - FW_ACTION_HOTPLUG, fw_name, sdma->dev, > + FW_ACTION_UEVENT, fw_name, sdma->dev, Naming is hard :) I can take this after -rc1, but really, is it needed? What problem does this renaming solve? Who is the current name confusing? thanks, greg k-h
On Sun, Apr 25, 2021 at 08:14:53AM +0200, Greg Kroah-Hartman wrote: > On Sun, Apr 25, 2021 at 10:00:24AM +0800, Shawn Guo wrote: > > 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. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > --- > > drivers/dma/imx-sdma.c | 2 +- > > drivers/media/platform/exynos4-is/fimc-is.c | 2 +- > > drivers/mfd/iqs62x.c | 2 +- > > drivers/misc/lattice-ecp3-config.c | 2 +- > > drivers/net/wireless/ti/wlcore/main.c | 2 +- > > drivers/platform/x86/dell/dell_rbu.c | 2 +- > > drivers/remoteproc/remoteproc_core.c | 2 +- > > drivers/scsi/lpfc/lpfc_init.c | 2 +- > > drivers/tty/serial/ucc_uart.c | 2 +- > > include/linux/firmware.h | 4 ++-- > > lib/test_firmware.c | 10 +++++----- > > sound/soc/codecs/wm8958-dsp2.c | 6 +++--- > > 12 files changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > > index d5590c08db51..e2b559945c11 100644 > > --- a/drivers/dma/imx-sdma.c > > +++ b/drivers/dma/imx-sdma.c > > @@ -1829,7 +1829,7 @@ static int sdma_get_firmware(struct sdma_engine *sdma, > > int ret; > > > > ret = request_firmware_nowait(THIS_MODULE, > > - FW_ACTION_HOTPLUG, fw_name, sdma->dev, > > + FW_ACTION_UEVENT, fw_name, sdma->dev, > > Naming is hard :) > > I can take this after -rc1, but really, is it needed? > > What problem does this renaming solve? To me, it's a leftover from commit 312c004d36ce that made the rename at driver core. With this patch, the define will be more matching its user request_firmware_nowait(..., bool uevent, ...). > Who is the current name > confusing? I'm one at least :) Shawn
On Sun, 25 Apr 2021, Shawn Guo wrote: > 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. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > drivers/dma/imx-sdma.c | 2 +- > drivers/media/platform/exynos4-is/fimc-is.c | 2 +- > drivers/mfd/iqs62x.c | 2 +- Acked-by: Lee Jones <lee.jones@linaro.org> > drivers/misc/lattice-ecp3-config.c | 2 +- > drivers/net/wireless/ti/wlcore/main.c | 2 +- > drivers/platform/x86/dell/dell_rbu.c | 2 +- > drivers/remoteproc/remoteproc_core.c | 2 +- > drivers/scsi/lpfc/lpfc_init.c | 2 +- > drivers/tty/serial/ucc_uart.c | 2 +- > include/linux/firmware.h | 4 ++-- > lib/test_firmware.c | 10 +++++----- > sound/soc/codecs/wm8958-dsp2.c | 6 +++--- > 12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index d5590c08db51..e2b559945c11 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1829,7 +1829,7 @@ static int sdma_get_firmware(struct sdma_engine *sdma, int ret; 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); return ret; diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 972d9601d236..8f3ba74f19f2 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -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) { 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); } diff --git a/drivers/mfd/iqs62x.c b/drivers/mfd/iqs62x.c index d1fc38a78acb..9805cf191245 100644 --- a/drivers/mfd/iqs62x.c +++ b/drivers/mfd/iqs62x.c @@ -998,7 +998,7 @@ static int iqs62x_probe(struct i2c_client *client) 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, &client->dev, GFP_KERNEL, iqs62x, iqs62x_firmware_load); diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c index 5eaf74447ca1..0f54730c7ed5 100644 --- a/drivers/misc/lattice-ecp3-config.c +++ b/drivers/misc/lattice-ecp3-config.c @@ -198,7 +198,7 @@ static int lattice_ecp3_probe(struct spi_device *spi) spi_set_drvdata(spi, data); 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, GFP_KERNEL, spi, firmware_load); if (err) { diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 8509b989940c..5bf15355c2b3 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -6784,7 +6784,7 @@ int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) if (pdev_data->family && 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, wl, wlcore_nvs_cb); if (ret < 0) { diff --git a/drivers/platform/x86/dell/dell_rbu.c b/drivers/platform/x86/dell/dell_rbu.c index 03c3ff34bcf5..8758d717ae5c 100644 --- a/drivers/platform/x86/dell/dell_rbu.c +++ b/drivers/platform/x86/dell/dell_rbu.c @@ -573,7 +573,7 @@ static ssize_t image_type_write(struct file *filp, struct kobject *kobj, if (!rbu_data.entry_created) { spin_unlock(&rbu_data.lock); req_firm_rc = request_firmware_nowait(THIS_MODULE, - FW_ACTION_NOHOTPLUG, "dell_rbu", + FW_ACTION_NOUEVENT, "dell_rbu", &rbu_device->dev, GFP_KERNEL, &context, callbackfn_rbu); if (req_firm_rc) { diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index ab150765d124..c3e01e95c0d2 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1628,7 +1628,7 @@ static int rproc_trigger_auto_boot(struct rproc *rproc) * We're initiating an asynchronous firmware loading, so we can * 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, rproc_auto_boot_callback); if (ret < 0) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 71f340dd4fbd..53546b079553 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -13159,7 +13159,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); 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, GFP_KERNEL, (void *)phba, lpfc_write_firmware); diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index d6a8604157ab..e651c9aafdd0 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c @@ -1227,7 +1227,7 @@ static int soft_uart_init(struct platform_device *ofdev) * kernel, then we use it. */ 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); if (ret) { dev_err(&ofdev->dev, diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 84e346ae766e..25109192cebe 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h @@ -6,8 +6,8 @@ #include <linux/compiler.h> #include <linux/gfp.h> -#define FW_ACTION_NOHOTPLUG 0 -#define FW_ACTION_HOTPLUG 1 +#define FW_ACTION_NOUEVENT 0 +#define FW_ACTION_UEVENT 1 struct firmware { size_t size; diff --git a/lib/test_firmware.c b/lib/test_firmware.c index b6fe89add9fe..1bccd6cd5f48 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -260,8 +260,8 @@ static ssize_t config_show(struct device *dev, len += scnprintf(buf + len, PAGE_SIZE - len, "send_uevent:\t\t%s\n", test_fw_config->send_uevent ? - "FW_ACTION_HOTPLUG" : - "FW_ACTION_NOHOTPLUG"); + "FW_ACTION_UEVENT" : + "FW_ACTION_NOUEVENT"); len += scnprintf(buf + len, PAGE_SIZE - len, "into_buf:\t\t%s\n", 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); release_firmware(test_firmware); 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, trigger_async_request_cb); 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", test_fw_config->name, test_fw_config->num_requests); - send_uevent = test_fw_config->send_uevent ? FW_ACTION_HOTPLUG : - FW_ACTION_NOHOTPLUG; + send_uevent = test_fw_config->send_uevent ? FW_ACTION_UEVENT : + FW_ACTION_NOUEVENT; for (i = 0; i < test_fw_config->num_requests; i++) { req = &test_fw_config->reqs[i]; diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index 3bce9a14f0f3..a5ea1645993b 100644 --- a/sound/soc/codecs/wm8958-dsp2.c +++ b/sound/soc/codecs/wm8958-dsp2.c @@ -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 */ - request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, + request_firmware_nowait(THIS_MODULE, FW_ACTION_UEVENT, "wm8958_mbc.wfw", component->dev, GFP_KERNEL, 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, 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, component, wm8958_enh_eq_loaded);
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. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- drivers/dma/imx-sdma.c | 2 +- drivers/media/platform/exynos4-is/fimc-is.c | 2 +- drivers/mfd/iqs62x.c | 2 +- drivers/misc/lattice-ecp3-config.c | 2 +- drivers/net/wireless/ti/wlcore/main.c | 2 +- drivers/platform/x86/dell/dell_rbu.c | 2 +- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/tty/serial/ucc_uart.c | 2 +- include/linux/firmware.h | 4 ++-- lib/test_firmware.c | 10 +++++----- sound/soc/codecs/wm8958-dsp2.c | 6 +++--- 12 files changed, 19 insertions(+), 19 deletions(-)