This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch releases/13.1 in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit a001e45f02bce729d629053ce65786f2c9e88788 Author: raiden00pl <[email protected]> AuthorDate: Thu Sep 24 15:48:12 2026 +0200 arch/nrf52,nrf53,nrf91: fix nxstyle issues arch/nrf52,nrf53,nrf91: fix nxstyle issues Signed-off-by: raiden00pl <[email protected]> --- arch/arm/src/nrf52/nrf52_gpiote.c | 7 ++++--- arch/arm/src/nrf52/nrf52_rtc.c | 1 + arch/arm/src/nrf52/nrf52_spi.c | 16 ++++++++-------- arch/arm/src/nrf53/nrf53_rtc.c | 1 + arch/arm/src/nrf53/nrf53_spi.c | 16 ++++++++-------- arch/arm/src/nrf91/nrf91_gpiote.c | 7 ++++--- arch/arm/src/nrf91/nrf91_rtc.c | 1 + arch/arm/src/nrf91/nrf91_spi.c | 16 ++++++++-------- 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/arch/arm/src/nrf52/nrf52_gpiote.c b/arch/arm/src/nrf52/nrf52_gpiote.c index 33c2e30fc68..2f30f0b1fa2 100644 --- a/arch/arm/src/nrf52/nrf52_gpiote.c +++ b/arch/arm/src/nrf52/nrf52_gpiote.c @@ -144,6 +144,7 @@ static int nrf52_gpiote_isr(int irq, void *context, void *arg) xcpt_t callback = g_gpiote_ch_callbacks[i].callback; void *cbarg = g_gpiote_ch_callbacks[i].arg; + ret = callback(irq, context, cbarg); /* Clear event */ @@ -172,11 +173,11 @@ static int nrf52_gpiote_isr(int irq, void *context, void *arg) { case 0: addr = NRF52_GPIO_P0_BASE + NRF52_GPIO_LATCH_OFFSET; - break; + break; #ifdef CONFIG_NRF52_HAVE_PORT1 case 1: addr = NRF52_GPIO_P1_BASE + NRF52_GPIO_LATCH_OFFSET; - break; + break; #endif } @@ -220,7 +221,7 @@ static int nrf52_gpiote_isr(int irq, void *context, void *arg) ret = callback(irq, context, cbarg); } #endif - } + } } return ret; diff --git a/arch/arm/src/nrf52/nrf52_rtc.c b/arch/arm/src/nrf52/nrf52_rtc.c index a99e80c79f6..be28515ca83 100644 --- a/arch/arm/src/nrf52/nrf52_rtc.c +++ b/arch/arm/src/nrf52/nrf52_rtc.c @@ -735,6 +735,7 @@ errout: static uint32_t nrf52_rtc_getbase(struct nrf52_rtc_dev_s *dev) { struct nrf52_rtc_priv_s *rtc = (struct nrf52_rtc_priv_s *)dev; + DEBUGASSERT(dev); return rtc->base; diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c index 0ecaad43fae..b4b958cb3b1 100644 --- a/arch/arm/src/nrf52/nrf52_spi.c +++ b/arch/arm/src/nrf52/nrf52_spi.c @@ -740,10 +740,10 @@ static uint32_t nrf52_spi_setfrequency(struct spi_dev_s *dev, switch (frequency) { case 125000: - { - regval = SPIM_FREQUENCY_125KBPS; - break; - } + { + regval = SPIM_FREQUENCY_125KBPS; + break; + } case 250000: { @@ -764,10 +764,10 @@ static uint32_t nrf52_spi_setfrequency(struct spi_dev_s *dev, } case 2000000: - { - regval = SPIM_FREQUENCY_2MBPS; - break; - } + { + regval = SPIM_FREQUENCY_2MBPS; + break; + } case 4000000: { diff --git a/arch/arm/src/nrf53/nrf53_rtc.c b/arch/arm/src/nrf53/nrf53_rtc.c index 4d492e7ed16..b7affd8cff6 100644 --- a/arch/arm/src/nrf53/nrf53_rtc.c +++ b/arch/arm/src/nrf53/nrf53_rtc.c @@ -722,6 +722,7 @@ errout: static uint32_t nrf53_rtc_getbase(struct nrf53_rtc_dev_s *dev) { struct nrf53_rtc_priv_s *rtc = (struct nrf53_rtc_priv_s *)dev; + DEBUGASSERT(dev); return rtc->base; diff --git a/arch/arm/src/nrf53/nrf53_spi.c b/arch/arm/src/nrf53/nrf53_spi.c index e17bd398041..6d9e7f40ce4 100644 --- a/arch/arm/src/nrf53/nrf53_spi.c +++ b/arch/arm/src/nrf53/nrf53_spi.c @@ -795,10 +795,10 @@ static uint32_t nrf53_spi_setfrequency(struct spi_dev_s *dev, switch (frequency) { case 125000: - { - regval = SPIM_FREQUENCY_125KBPS; - break; - } + { + regval = SPIM_FREQUENCY_125KBPS; + break; + } case 250000: { @@ -819,10 +819,10 @@ static uint32_t nrf53_spi_setfrequency(struct spi_dev_s *dev, } case 2000000: - { - regval = SPIM_FREQUENCY_2MBPS; - break; - } + { + regval = SPIM_FREQUENCY_2MBPS; + break; + } case 4000000: { diff --git a/arch/arm/src/nrf91/nrf91_gpiote.c b/arch/arm/src/nrf91/nrf91_gpiote.c index 71ae787d060..2bba898488a 100644 --- a/arch/arm/src/nrf91/nrf91_gpiote.c +++ b/arch/arm/src/nrf91/nrf91_gpiote.c @@ -155,6 +155,7 @@ static int nrf91_gpiote_isr(int irq, void *context, void *arg) xcpt_t callback = g_gpiote_ch_callbacks[i].callback; void *cbarg = g_gpiote_ch_callbacks[i].arg; + ret = callback(irq, context, cbarg); /* Clear event */ @@ -183,11 +184,11 @@ static int nrf91_gpiote_isr(int irq, void *context, void *arg) { case 0: addr = NRF91_GPIO_P0_BASE + NRF91_GPIO_LATCH_OFFSET; - break; + break; #ifdef CONFIG_NRF91_HAVE_PORT1 case 1: addr = NRF91_GPIO_P1_BASE + NRF91_GPIO_LATCH_OFFSET; - break; + break; #endif } @@ -231,7 +232,7 @@ static int nrf91_gpiote_isr(int irq, void *context, void *arg) ret = callback(irq, context, cbarg); } #endif - } + } } return ret; diff --git a/arch/arm/src/nrf91/nrf91_rtc.c b/arch/arm/src/nrf91/nrf91_rtc.c index 7905973b42c..b2ce9cedc8f 100644 --- a/arch/arm/src/nrf91/nrf91_rtc.c +++ b/arch/arm/src/nrf91/nrf91_rtc.c @@ -722,6 +722,7 @@ errout: static uint32_t nrf91_rtc_getbase(struct nrf91_rtc_dev_s *dev) { struct nrf91_rtc_priv_s *rtc = (struct nrf91_rtc_priv_s *)dev; + DEBUGASSERT(dev); return rtc->base; diff --git a/arch/arm/src/nrf91/nrf91_spi.c b/arch/arm/src/nrf91/nrf91_spi.c index 5777aa1deba..7b1799577e0 100644 --- a/arch/arm/src/nrf91/nrf91_spi.c +++ b/arch/arm/src/nrf91/nrf91_spi.c @@ -713,10 +713,10 @@ static uint32_t nrf91_spi_setfrequency(struct spi_dev_s *dev, switch (frequency) { case 125000: - { - regval = SPIM_FREQUENCY_125KBPS; - break; - } + { + regval = SPIM_FREQUENCY_125KBPS; + break; + } case 250000: { @@ -737,10 +737,10 @@ static uint32_t nrf91_spi_setfrequency(struct spi_dev_s *dev, } case 2000000: - { - regval = SPIM_FREQUENCY_2MBPS; - break; - } + { + regval = SPIM_FREQUENCY_2MBPS; + break; + } case 4000000: {
