This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5515e09e8dfe3f5e21fe001890d0041319ee2fa1 Author: YAMAMOTO Takashi <[email protected]> AuthorDate: Mon Jan 27 13:31:25 2020 +0900 Fix some "from from" in code comments --- arch/arm/src/cxd56xx/cxd56_udmac.c | 2 +- arch/arm/src/efm32/efm32_dma.c | 2 +- arch/arm/src/lpc43xx/lpc43_adc.c | 2 +- arch/arm/src/lpc43xx/lpc43_dac.c | 2 +- arch/arm/src/lpc43xx/lpc43_i2c.c | 2 +- arch/arm/src/sama5/Kconfig | 4 ++-- graphics/vnc/server/vnc_negotiate.c | 2 +- graphics/vnc/server/vnc_server.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c index 258b4bd..258c50a 100644 --- a/arch/arm/src/cxd56xx/cxd56_udmac.c +++ b/arch/arm/src/cxd56xx/cxd56_udmac.c @@ -305,7 +305,7 @@ DMA_HANDLE cxd56_udmachannel(void) unsigned int ch; uint32_t bit; - /* Take a count from from the channel counting semaphore. We may block + /* Take a count from the channel counting semaphore. We may block * if there are no free channels. When we get the count, then we can * be assured that a channel is available in the channel list and is * reserved for us. diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c index 6d8e238..8bb9cb7 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -338,7 +338,7 @@ DMA_HANDLE efm32_dmachannel(void) unsigned int chndx; uint32_t bit; - /* Take a count from from the channel counting semaphore. We may block + /* Take a count from the channel counting semaphore. We may block * if there are no free channels. When we get the count, then we can * be assured that a channel is available in the channel list and is * reserved for us. diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c index bcb3db1..921364d 100644 --- a/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/arch/arm/src/lpc43xx/lpc43_adc.c @@ -4,7 +4,7 @@ * Copyright(C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <[email protected]> * - * Ported from from the LPC17 version: + * Ported from the LPC17 version: * * Copyright(C) 2011 Li Zhuoyi. All rights reserved. * Copyright(C) 2016 Gregory Nutt. All rights reserved. diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c index 6c354c7..582c8f6 100644 --- a/arch/arm/src/lpc43xx/lpc43_dac.c +++ b/arch/arm/src/lpc43xx/lpc43_dac.c @@ -4,7 +4,7 @@ * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <[email protected]> * - * Ported from from the LPC17 version: + * Ported from the LPC17 version: * * Copyright (C) 2011 Li Zhuoyi. All rights reserved. * Author: Li Zhuoyi <[email protected]> diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c index 64d0085..a16f5e8 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -4,7 +4,7 @@ * Copyright (C) 2012, 2014-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <[email protected]> * - * Ported from from the LPC17 version: + * Ported from the LPC17 version: * * Copyright (C) 2011 Li Zhuoyi. All rights reserved. * Author: Li Zhuoyi <[email protected]> diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig index c475309..fd82456 100644 --- a/arch/arm/src/sama5/Kconfig +++ b/arch/arm/src/sama5/Kconfig @@ -3952,7 +3952,7 @@ config SAMA5_PWM_CLKA_FREQUENCY depends on SAMA5_PWM_CLKA ---help--- If the CLKA source is enabled, then you must also provide the - frequency of the CLKA. This frequency will be derived from from MCK + frequency of the CLKA. This frequency will be derived from MCK using a prescaler and divider. Therefore, a wide range of frequencies are possible. @@ -3968,7 +3968,7 @@ config SAMA5_PWM_CLKB_FREQUENCY depends on SAMA5_PWM_CLKB ---help--- If the CLKB source is enabled, then you must also provide the - frequency of the CLKB. This frequency will be derived from from MCK + frequency of the CLKB. This frequency will be derived from MCK using a prescaler and divider. Therefore, a wide range of frequencies are possible. diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c index beaad4e..097f3f4 100644 --- a/graphics/vnc/server/vnc_negotiate.c +++ b/graphics/vnc/server/vnc_negotiate.c @@ -461,7 +461,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session) * * Input Parameters: * session - An instance of the session structure. - * pixelfmt - The pixel from from the received SetPixelFormat message + * pixelfmt - The pixel from the received SetPixelFormat message * * Returned Value: * Returns zero (OK) on success; a negated errno value on failure. diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h index 6bfc686..3bf5216 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/graphics/vnc/server/vnc_server.h @@ -371,7 +371,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session); * * Input Parameters: * session - An instance of the session structure. - * pixelfmt - The pixel from from the received SetPixelFormat message + * pixelfmt - The pixel from the received SetPixelFormat message * * Returned Value: * Returns zero (OK) on success; a negated errno value on failure.
