Skip to content

Commit

Permalink
Remove type casting to wdentry_t (arch/)
Browse files Browse the repository at this point in the history
  • Loading branch information
@YuuichiNakamura @patacongo
YuuichiNakamura authored and patacongo committed Apr 7, 2020
1 parent 2ca9681 commit e264484
Show file tree
Hide file tree
Showing 29 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions arch/arm/src/cxd56xx/cxd56_rtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int cxd56_rtc_interrupt(int irq, FAR void *context, FAR void *arg)
*
************************************************************************************/

static void cxd56_rtc_initialize(int argc, uint32_t arg)
static void cxd56_rtc_initialize(int argc, uint32_t arg, ...)
{
struct timespec ts;
#ifdef CONFIG_CXD56_RTC_LATEINIT
Expand Down Expand Up @@ -285,7 +285,7 @@ static void cxd56_rtc_initialize(int argc, uint32_t arg)
rtcinfo("retry count: %d\n", s_retry);

if (OK == wd_start(s_wdog, MSEC2TICK(RTC_CLOCK_CHECK_INTERVAL),
(wdentry_t)cxd56_rtc_initialize, 1, (wdparm_t)NULL))
cxd56_rtc_initialize, 1, (wdparm_t)NULL))
{
/* Again, this function is called recursively */

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/cxd56xx/cxd56_sdhci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ static void cxd56_dataconfig(struct cxd56_sdiodev_s *priv, bool bwrite,
static void cxd56_datadisable(void);
static void cxd56_transmit(struct cxd56_sdiodev_s *priv);
static void cxd56_receive(struct cxd56_sdiodev_s *priv);
static void cxd56_eventtimeout(int argc, uint32_t arg);
static void cxd56_eventtimeout(int argc, uint32_t arg, ...);
static void cxd56_endwait(struct cxd56_sdiodev_s *priv,
sdio_eventset_t wkupevent);
static void cxd56_endtransfer(struct cxd56_sdiodev_s *priv,
Expand Down Expand Up @@ -1021,7 +1021,7 @@ static void cxd56_receive(struct cxd56_sdiodev_s *priv)
*
****************************************************************************/

static void cxd56_eventtimeout(int argc, uint32_t arg)
static void cxd56_eventtimeout(int argc, uint32_t arg, ...)
{
struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)arg;

Expand Down Expand Up @@ -2651,7 +2651,7 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev,
/* Start the watchdog timer */

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)cxd56_eventtimeout,
ret = wd_start(priv->waitwdog, delay, cxd56_eventtimeout,
1, (uint32_t)priv);
if (ret != OK)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/imxrt/imxrt_usdhc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static void imxrt_transmit(struct imxrt_dev_s *priv);
static void imxrt_receive(struct imxrt_dev_s *priv);
#endif

static void imxrt_eventtimeout(int argc, uint32_t arg);
static void imxrt_eventtimeout(int argc, uint32_t arg, ...);
static void imxrt_endwait(struct imxrt_dev_s *priv,
sdio_eventset_t wkupevent);
static void imxrt_endtransfer(struct imxrt_dev_s *priv,
Expand Down Expand Up @@ -1017,7 +1017,7 @@ static void imxrt_receive(struct imxrt_dev_s *priv)
*
****************************************************************************/

static void imxrt_eventtimeout(int argc, uint32_t arg)
static void imxrt_eventtimeout(int argc, uint32_t arg, ...)
{
struct imxrt_dev_s *priv = (struct imxrt_dev_s *)arg;

Expand Down Expand Up @@ -2708,7 +2708,7 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev,
/* Start the watchdog timer */

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t) imxrt_eventtimeout,
ret = wd_start(priv->waitwdog, delay, imxrt_eventtimeout,
1, (uint32_t) priv);

if (ret < 0)
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/kinetis/kinetis_sdhc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void kinetis_datadisable(void);
static void kinetis_transmit(struct kinetis_dev_s *priv);
static void kinetis_receive(struct kinetis_dev_s *priv);
#endif
static void kinetis_eventtimeout(int argc, uint32_t arg);
static void kinetis_eventtimeout(int argc, uint32_t arg, ...);
static void kinetis_endwait(struct kinetis_dev_s *priv,
sdio_eventset_t wkupevent);
static void kinetis_endtransfer(struct kinetis_dev_s *priv,
Expand Down Expand Up @@ -934,7 +934,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv)
*
****************************************************************************/

static void kinetis_eventtimeout(int argc, uint32_t arg)
static void kinetis_eventtimeout(int argc, uint32_t arg, ...)
{
struct kinetis_dev_s *priv = (struct kinetis_dev_s *)arg;

Expand Down Expand Up @@ -2507,7 +2507,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev,

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay,
(wdentry_t)kinetis_eventtimeout,
kinetis_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ static void lpc17_40_dataconfig(uint32_t timeout, uint32_t dlen,
static void lpc17_40_datadisable(void);
static void lpc17_40_sendfifo(struct lpc17_40_dev_s *priv);
static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv);
static void lpc17_40_eventtimeout(int argc, uint32_t arg);
static void lpc17_40_eventtimeout(int argc, uint32_t arg, ...);
static void lpc17_40_endwait(struct lpc17_40_dev_s *priv,
sdio_eventset_t wkupevent);
static void lpc17_40_endtransfer(struct lpc17_40_dev_s *priv,
Expand Down Expand Up @@ -1088,7 +1088,7 @@ static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv)
*
****************************************************************************/

static void lpc17_40_eventtimeout(int argc, uint32_t arg)
static void lpc17_40_eventtimeout(int argc, uint32_t arg, ...)
{
struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)arg;

Expand Down Expand Up @@ -2345,7 +2345,7 @@ static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev,

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay,
(wdentry_t) lpc17_40_eventtimeout,
lpc17_40_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/lpc43xx/lpc43_sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask,

/* Data Transfer Helpers ****************************************************/

static void lpc43_eventtimeout(int argc, uint32_t arg);
static void lpc43_eventtimeout(int argc, uint32_t arg, ...);
static void lpc43_endwait(struct lpc43_dev_s *priv,
sdio_eventset_t wkupevent);
static void lpc43_endtransfer(struct lpc43_dev_s *priv,
Expand Down Expand Up @@ -838,7 +838,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask,
*
****************************************************************************/

static void lpc43_eventtimeout(int argc, uint32_t arg)
static void lpc43_eventtimeout(int argc, uint32_t arg, ...)
{
struct lpc43_dev_s *priv = (struct lpc43_dev_s *)arg;

Expand Down Expand Up @@ -2313,7 +2313,7 @@ static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev,
/* Start the watchdog timer */

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)lpc43_eventtimeout,
ret = wd_start(priv->waitwdog, delay, lpc43_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/lpc54xx/lpc54_sdmmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask,

/* Data Transfer Helpers ****************************************************/

static void lpc54_eventtimeout(int argc, uint32_t arg);
static void lpc54_eventtimeout(int argc, uint32_t arg, ...);
static void lpc54_endwait(struct lpc54_dev_s *priv,
sdio_eventset_t wkupevent);
static void lpc54_endtransfer(struct lpc54_dev_s *priv,
Expand Down Expand Up @@ -838,7 +838,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask,
*
****************************************************************************/

static void lpc54_eventtimeout(int argc, uint32_t arg)
static void lpc54_eventtimeout(int argc, uint32_t arg, ...)
{
struct lpc54_dev_s *priv = (struct lpc54_dev_s *)arg;

Expand Down Expand Up @@ -2313,7 +2313,7 @@ static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev,
/* Start the watchdog timer */

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)lpc54_eventtimeout,
ret = wd_start(priv->waitwdog, delay, lpc54_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/sam34/sam_hsmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result);

/* Data Transfer Helpers ****************************************************/

static void sam_eventtimeout(int argc, uint32_t arg);
static void sam_eventtimeout(int argc, uint32_t arg, ...);
static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent);
static void sam_endtransfer(struct sam_dev_s *priv,
sdio_eventset_t wkupevent);
Expand Down Expand Up @@ -1088,7 +1088,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
*
****************************************************************************/

static void sam_eventtimeout(int argc, uint32_t arg)
static void sam_eventtimeout(int argc, uint32_t arg, ...)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;

Expand Down Expand Up @@ -2328,7 +2328,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
/* Start the watchdog timer */

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)sam_eventtimeout,
ret = wd_start(priv->waitwdog, delay, sam_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/sam34/sam_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/

#ifdef CONFIG_SAM34_SPI_DMA
static void spi_dmatimeout(int argc, uint32_t arg)
static void spi_dmatimeout(int argc, uint32_t arg, ...)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
Expand Down Expand Up @@ -1585,7 +1585,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
/* Start (or re-start) the watchdog timeout */

ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS,
(wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
spi_dmatimeout, 1, (uint32_t)spics);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/sama5/sam_hsmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv,

/* Data Transfer Helpers ****************************************************/

static void sam_eventtimeout(int argc, uint32_t arg);
static void sam_eventtimeout(int argc, uint32_t arg, ...);
static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent);
static void sam_endtransfer(struct sam_dev_s *priv,
sdio_eventset_t wkupevent);
Expand Down Expand Up @@ -1310,7 +1310,7 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv,
*
****************************************************************************/

static void sam_eventtimeout(int argc, uint32_t arg)
static void sam_eventtimeout(int argc, uint32_t arg, ...)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;

Expand Down Expand Up @@ -2755,7 +2755,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
}

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)sam_eventtimeout,
ret = wd_start(priv->waitwdog, delay, sam_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/sama5/sam_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/

#ifdef CONFIG_SAMA5_SPI_DMA
static void spi_dmatimeout(int argc, uint32_t arg)
static void spi_dmatimeout(int argc, uint32_t arg, ...)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
Expand Down Expand Up @@ -1511,7 +1511,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
/* Start (or re-start) the watchdog timeout */

ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS,
(wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
spi_dmatimeout, 1, (uint32_t)spics);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/src/sama5/sam_ssc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,14 +578,14 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result);
#endif

#ifdef SSC_HAVE_RX
static void ssc_rxdma_timeout(int argc, uint32_t arg);
static void ssc_rxdma_timeout(int argc, uint32_t arg, ...);
static int ssc_rxdma_setup(struct sam_ssc_s *priv);
static void ssc_rx_worker(void *arg);
static void ssc_rx_schedule(struct sam_ssc_s *priv, int result);
static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result);
#endif
#ifdef SSC_HAVE_TX
static void ssc_txdma_timeout(int argc, uint32_t arg);
static void ssc_txdma_timeout(int argc, uint32_t arg, ...);
static int ssc_txdma_setup(struct sam_ssc_s *priv);
static void ssc_tx_worker(void *arg);
static void ssc_tx_schedule(struct sam_ssc_s *priv, int result);
Expand Down Expand Up @@ -1193,7 +1193,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
****************************************************************************/

#ifdef SSC_HAVE_RX
static void ssc_rxdma_timeout(int argc, uint32_t arg)
static void ssc_rxdma_timeout(int argc, uint32_t arg, ...)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
Expand Down Expand Up @@ -1340,7 +1340,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv)

if (!notimeout)
{
ret = wd_start(priv->rx.dog, timeout, (wdentry_t)ssc_rxdma_timeout,
ret = wd_start(priv->rx.dog, timeout, ssc_rxdma_timeout,
1, (uint32_t)priv);

/* Check if we have successfully started the watchdog timer. Note
Expand Down Expand Up @@ -1605,7 +1605,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result)
****************************************************************************/

#ifdef SSC_HAVE_TX
static void ssc_txdma_timeout(int argc, uint32_t arg)
static void ssc_txdma_timeout(int argc, uint32_t arg, ...)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
Expand Down Expand Up @@ -1753,7 +1753,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv)

if (!notimeout)
{
ret = wd_start(priv->tx.dog, timeout, (wdentry_t)ssc_txdma_timeout,
ret = wd_start(priv->tx.dog, timeout, ssc_txdma_timeout,
1, (uint32_t)priv);

/* Check if we have successfully started the watchdog timer. Note
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/src/samv7/sam_hsmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv,

/* Data Transfer Helpers ****************************************************/

static void sam_eventtimeout(int argc, uint32_t arg);
static void sam_eventtimeout(int argc, uint32_t arg, ...);
static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent);
static void sam_endtransfer(struct sam_dev_s *priv,
sdio_eventset_t wkupevent);
Expand Down Expand Up @@ -1246,7 +1246,7 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv,
*
****************************************************************************/

static void sam_eventtimeout(int argc, uint32_t arg)
static void sam_eventtimeout(int argc, uint32_t arg, ...)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;

Expand Down Expand Up @@ -2803,7 +2803,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
}

delay = MSEC2TICK(timeout);
ret = wd_start(priv->waitwdog, delay, (wdentry_t)sam_eventtimeout,
ret = wd_start(priv->waitwdog, delay, sam_eventtimeout,
1, (uint32_t)priv);
if (ret < 0)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/samv7/sam_qspi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ static void qspi_dma_sampledone(struct sam_qspidev_s *priv)
****************************************************************************/

#ifdef CONFIG_SAMV7_QSPI_DMA
static void qspi_dma_timeout(int argc, uint32_t arg)
static void qspi_dma_timeout(int argc, uint32_t arg, ...)
{
struct sam_qspidev_s *priv = (struct sam_qspidev_s *)arg;
DEBUGASSERT(priv != NULL);
Expand Down Expand Up @@ -883,7 +883,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv,
/* Start (or re-start) the watchdog timeout */

ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS,
(wdentry_t)qspi_dma_timeout, 1, (uint32_t)priv);
qspi_dma_timeout, 1, (uint32_t)priv);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/samv7/sam_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/

#ifdef CONFIG_SAMV7_SPI_DMA
static void spi_dmatimeout(int argc, uint32_t arg)
static void spi_dmatimeout(int argc, uint32_t arg, ...)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
Expand Down Expand Up @@ -1858,7 +1858,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
/* Start (or re-start) the watchdog timeout */

ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS,
(wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
spi_dmatimeout, 1, (uint32_t)spics);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
Expand Down
Loading

0 comments on commit e264484

Please sign in to comment.