From d804c1441ff4864bdf778e3737423cf826bcad44 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 3 Jan 2020 17:05:28 +0800 Subject: [PATCH] Fix stm32l4_otgfshost.c: error: 'ret' undeclared result by commit 6a3c2aded683e8284e793eb3ee8793d2960ae000 Change-Id: I68ba79417d8da102da8d91c74496961aef242dd9 Signed-off-by: Xiang Xiao --- arch/arm/src/lc823450/lc823450_usbdev.c | 2 +- arch/arm/src/sama5/sam_tsd.c | 4 ---- arch/arm/src/stm32/stm32_adc.c | 4 ++-- arch/arm/src/stm32l4/stm32l4_otgfshost.c | 1 + drivers/input/ads7843e.c | 4 ---- drivers/usbhost/usbhost_hidmouse.c | 4 ---- 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c index ef26dab675748..1363641e83a2e 100644 --- a/arch/arm/src/lc823450/lc823450_usbdev.c +++ b/arch/arm/src/lc823450/lc823450_usbdev.c @@ -1925,7 +1925,7 @@ int usbdev_msc_epread(void *buf, int len) CONFIG_USBMSC_EPBULKOUT << USB_DMAC_DMAEP_SHIFT | USB_DMAC_START, USB_DMAC1); - nxsem_wait(&dma_wait); + nxsem_wait(&dma_wait); return 0; } diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index bd45d3466f15d..e8126bc98823b 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -378,10 +378,6 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl if (ret < 0) { - /* If we are awakened by a signal, then we need to return - * the failure now. - */ - ierr("ERROR: nxsem_wait: %d\n", ret); goto errout; } diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index e7927608345de..c887e303f220d 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -1854,7 +1854,7 @@ static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable) #ifdef HAVE_ADC_CMN_DATA static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock) { - int ret = OK; + int ret; if (lock) { @@ -1862,7 +1862,7 @@ static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock) } else { - nxsem_post(&priv->cmn->lock); + ret = nxsem_post(&priv->cmn->lock); } return ret; diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c index 247a737e0c46c..df35a6b78b3aa 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c @@ -1079,6 +1079,7 @@ static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv, FAR struct stm32l4_chan_s *chan) { irqstate_t flags; + int ret; /* Disable interrupts so that the following operations will be atomic. On * the OTG FS global interrupt needs to be disabled. However, here we disable diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index 10cb5073b1771..2c752ed794f41 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -418,10 +418,6 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv, if (ret < 0) { - /* If we are awakened by a signal, then we need to return - * the failure now. - */ - ierr("ERROR: nxsem_wait: %d\n", ret); goto errout; } diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c index a1601ab91028a..751db6f5d5cc3 100644 --- a/drivers/usbhost/usbhost_hidmouse.c +++ b/drivers/usbhost/usbhost_hidmouse.c @@ -1354,10 +1354,6 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv, if (ret < 0) { - /* If we are awakened by a signal, then we need to return - * the failure now. - */ - ierr("ERROR: nxsem_wait: %d\n", ret); goto errout; }