From 32ee2ae4075d78bd3178ff3d9e1c74ef334bc50e Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 17 Apr 2022 23:05:40 +0800 Subject: [PATCH] Remove the unneeded worker_t cast Signed-off-by: Xiang Xiao --- arch/arm/src/cxd56xx/cxd56_sdhci.c | 2 +- arch/arm/src/imxrt/imxrt_usdhc.c | 4 ++-- arch/arm/src/kinetis/kinetis_sdhc.c | 2 +- arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c | 2 +- arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c | 6 +++--- arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c | 4 ++-- arch/arm/src/lpc43xx/lpc43_sdmmc.c | 2 +- arch/arm/src/lpc54xx/lpc54_sdmmc.c | 2 +- arch/arm/src/sam34/sam_hsmci.c | 2 +- arch/arm/src/sama5/sam_hsmci.c | 2 +- arch/arm/src/sama5/sam_sdmmc.c | 4 ++-- arch/arm/src/samv7/sam_hsmci.c | 2 +- arch/arm/src/stm32/stm32_sdio.c | 2 +- arch/arm/src/stm32f7/stm32_sdmmc.c | 2 +- arch/arm/src/stm32h7/stm32_sdmmc.c | 6 +++--- arch/arm/src/stm32l4/stm32l4_sdmmc.c | 2 +- arch/risc-v/src/bl602/bl602_os_hal.c | 4 ++-- arch/risc-v/src/litex/litex_sdio.c | 2 +- arch/risc-v/src/mpfs/mpfs_emmcsd.c | 2 +- drivers/usbhost/usbhost_cdcacm.c | 2 +- drivers/usbhost/usbhost_cdcmbim.c | 8 ++++---- drivers/usbhost/usbhost_hub.c | 4 ++-- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c index 7b6ed58352e..423f51bd188 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.c +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c @@ -3163,7 +3163,7 @@ static void cxd56_sdio_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, delay); } else diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index 950eceda020..c59dd9b0f1a 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -1330,7 +1330,7 @@ static int imxrt_interrupt(int irq, void *context, FAR void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + (void)work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else @@ -3148,7 +3148,7 @@ static void imxrt_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index e3058f716d3..3b3ffe012b2 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -2831,7 +2831,7 @@ static void kinetis_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c index e21b25c45d2..da106ef420f 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c @@ -615,7 +615,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) #ifdef CONFIG_ADC_WORKER_THREAD if (adc0_int_done == 1) { - work_queue(HPWORK, &priv->irqwork, (worker_t)adc_irqworker, + work_queue(HPWORK, &priv->irqwork, adc_irqworker, (FAR void *)priv, 0); } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index 00ba8ce03b9..3d7684f71d9 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -1277,7 +1277,7 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) */ work_queue(ETHWORK, &priv->lp_rxwork, - (worker_t)lpc17_40_rxdone_work, priv, 0); + lpc17_40_rxdone_work, priv, 0); } /* Check for Tx events ********************************************/ @@ -1339,7 +1339,7 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) */ work_queue(ETHWORK, &priv->lp_txwork, - (worker_t)lpc17_40_txdone_work, priv, 0); + lpc17_40_txdone_work, priv, 0); } } } @@ -1489,7 +1489,7 @@ static void lpc17_40_poll_work(FAR void *arg) if (considx != prodidx) { - work_queue(ETHWORK, &priv->lp_rxwork, (worker_t)lpc17_40_rxdone_work, + work_queue(ETHWORK, &priv->lp_rxwork, lpc17_40_rxdone_work, priv, 0); } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c index 1c75f22a5a4..87fde5773bf 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c @@ -2697,8 +2697,8 @@ static void lpc17_40_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, - priv->cbarg, 0); + work_queue(HPWORK, &priv->cbwork, priv->callback, + priv->cbarg, 0); } else { diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c index b23bcbadbc4..7076638bfdc 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -2787,7 +2787,7 @@ static void lpc43_callback(struct lpc43_dev_s *priv) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index edb088d329f..fe608c50563 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -2783,7 +2783,7 @@ static void lpc54_callback(struct lpc54_dev_s *priv) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index e034ae885dd..971e8e0d4ab 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -2682,7 +2682,7 @@ static void sam_callback(void *arg) priv->callback, priv->cbarg); work_queue(LPWORK, &priv->cbwork, - (worker_t)priv->callback, priv->cbarg, 0); + priv->callback, priv->cbarg, 0); } else { diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index 4684dd05b6b..22580657328 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -3162,7 +3162,7 @@ static void sam_callback(void *arg) } mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, + ret = work_queue(LPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); if (ret < 0) { diff --git a/arch/arm/src/sama5/sam_sdmmc.c b/arch/arm/src/sama5/sam_sdmmc.c index 545320961e1..1af67ac78d4 100644 --- a/arch/arm/src/sama5/sam_sdmmc.c +++ b/arch/arm/src/sama5/sam_sdmmc.c @@ -1427,7 +1427,7 @@ static int sam_interrupt(int irq, void *context, FAR void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + (void)work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else @@ -3242,7 +3242,7 @@ static void sam_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index e79e2218e91..a094c4afb0a 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -3228,7 +3228,7 @@ static void sam_callback(void *arg) } mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, + ret = work_queue(LPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); if (ret < 0) { diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index c25dddcb6c2..fbf68cee39b 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -3006,7 +3006,7 @@ static void stm32_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 7237a8d347e..21bbb9e6d28 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -3294,7 +3294,7 @@ static void stm32_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c index 1f81d5605ad..929c720f59d 100644 --- a/arch/arm/src/stm32h7/stm32_sdmmc.c +++ b/arch/arm/src/stm32h7/stm32_sdmmc.c @@ -1609,7 +1609,7 @@ static void stm32_sdmmc_fifo_monitor(FAR void *arg) STM32_SDMMC_STA_DPSMACT) { work_queue(HPWORK, &priv->cbfifo, - (worker_t)stm32_sdmmc_fifo_monitor, arg, 1); + stm32_sdmmc_fifo_monitor, arg, 1); } } #endif @@ -1696,7 +1696,7 @@ static int stm32_sdmmc_interrupt(int irq, void *context, void *arg) stm32_recvfifo(priv); work_queue(HPWORK, &priv->cbfifo, - (worker_t)stm32_sdmmc_fifo_monitor, arg, 1); + stm32_sdmmc_fifo_monitor, arg, 1); } /* Otherwise, Is the transmit FIFO half empty or less? If so @@ -3402,7 +3402,7 @@ static void stm32_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index 32c43865371..88cf0567174 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -3002,7 +3002,7 @@ static void stm32_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/risc-v/src/bl602/bl602_os_hal.c b/arch/risc-v/src/bl602/bl602_os_hal.c index e2c3fdb9669..8b32067f393 100644 --- a/arch/risc-v/src/bl602/bl602_os_hal.c +++ b/arch/risc-v/src/bl602/bl602_os_hal.c @@ -1103,7 +1103,7 @@ int bl_os_workqueue_submit_hpwork(void *work, return -EINVAL; } - return work_queue(OS_HPWORK, work, (worker_t)worker, argv, tick); + return work_queue(OS_HPWORK, work, worker, argv, tick); } /**************************************************************************** @@ -1132,7 +1132,7 @@ int bl_os_workqueue_submit_lpwork(void *work, return -EINVAL; } - return work_queue(OS_LPWORK, work, (worker_t)worker, argv, tick); + return work_queue(OS_LPWORK, work, worker, argv, tick); } /**************************************************************************** diff --git a/arch/risc-v/src/litex/litex_sdio.c b/arch/risc-v/src/litex/litex_sdio.c index 17ec63bbb13..82e605de2cc 100644 --- a/arch/risc-v/src/litex/litex_sdio.c +++ b/arch/risc-v/src/litex/litex_sdio.c @@ -1329,7 +1329,7 @@ static void litex_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/arch/risc-v/src/mpfs/mpfs_emmcsd.c b/arch/risc-v/src/mpfs/mpfs_emmcsd.c index 684f91c37f0..10a72ec34b5 100755 --- a/arch/risc-v/src/mpfs/mpfs_emmcsd.c +++ b/arch/risc-v/src/mpfs/mpfs_emmcsd.c @@ -2892,7 +2892,7 @@ static void mpfs_callback(void *arg) mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); - work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, + work_queue(HPWORK, &priv->cbwork, priv->callback, priv->cbarg, 0); } else diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c index 381420f6af5..22b0f593321 100644 --- a/drivers/usbhost/usbhost_cdcacm.c +++ b/drivers/usbhost/usbhost_cdcacm.c @@ -895,7 +895,7 @@ static void usbhost_notification_callback(FAR void *arg, ssize_t nbytes) if (work_available(&priv->ntwork)) { work_queue(HPWORK, &priv->ntwork, - (worker_t)usbhost_notification_work, + usbhost_notification_work, priv, delay); } } diff --git a/drivers/usbhost/usbhost_cdcmbim.c b/drivers/usbhost/usbhost_cdcmbim.c index ff868ea7c44..d6c8df70ef8 100644 --- a/drivers/usbhost/usbhost_cdcmbim.c +++ b/drivers/usbhost/usbhost_cdcmbim.c @@ -500,7 +500,7 @@ static ssize_t cdcwdm_read(FAR struct file *filep, FAR char *buffer, if (work_available(&priv->comm_rxwork)) { (void)work_queue(LPWORK, &priv->comm_rxwork, - (worker_t)usbhost_rxdata_work, + usbhost_rxdata_work, priv, 0); } } @@ -797,7 +797,7 @@ static void usbhost_bulkin_callback(FAR void *arg, ssize_t nbytes) if (work_available(&priv->bulk_rxwork)) { (void)work_queue(LPWORK, &priv->bulk_rxwork, - (worker_t)usbhost_bulkin_work, priv, delay); + usbhost_bulkin_work, priv, delay); } } @@ -1022,7 +1022,7 @@ static void usbhost_notification_work(FAR void *arg) if (work_available(&priv->comm_rxwork)) { (void)work_queue(LPWORK, &priv->comm_rxwork, - (worker_t)usbhost_rxdata_work, + usbhost_rxdata_work, priv, 0); } } @@ -1117,7 +1117,7 @@ static void usbhost_notification_callback(FAR void *arg, ssize_t nbytes) if (work_available(&priv->ntwork)) { (void)work_queue(LPWORK, &priv->ntwork, - (worker_t)usbhost_notification_work, + usbhost_notification_work, priv, delay); } } diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c index 209ac561a70..d0eeb4fbef1 100644 --- a/drivers/usbhost/usbhost_hub.c +++ b/drivers/usbhost/usbhost_hub.c @@ -1236,7 +1236,7 @@ static void usbhost_callback(FAR void *arg, ssize_t nbytes) if (work_available(&priv->work) && !priv->disconnected) { - work_queue(LPWORK, &priv->work, (worker_t)usbhost_hub_event, + work_queue(LPWORK, &priv->work, usbhost_hub_event, hubclass, delay); } } @@ -1496,7 +1496,7 @@ static int usbhost_disconnected(struct usbhost_class_s *hubclass) /* Schedule the disconnection work */ ret = work_queue(LPWORK, &priv->work, - (worker_t)usbhost_disconnect_event, hubclass, 0); + usbhost_disconnect_event, hubclass, 0); leave_critical_section(flags); return ret; }