diff mbox series

[v2,1/6] mtd: spi-nor: Drop inline on all internal helpers

Message ID 20181129141026.24892-2-boris.brezillon@bootlin.com
State Superseded
Headers show
Series mtd: spi-nor: Random cleanups | expand

Commit Message

Boris Brezillon Nov. 29, 2018, 2:10 p.m. UTC
gcc should be smart enough to decide when inlining a function makes
sense. Drop all inline specifiers.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Changes in v2:
- None
---
 drivers/mtd/spi-nor/spi-nor.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Alexander A Sverdlin Nov. 29, 2018, 4:16 p.m. UTC | #1
On 29/11/2018 15:10, Boris Brezillon wrote:
> gcc should be smart enough to decide when inlining a function makes
> sense. Drop all inline specifiers.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

Reviewed-by: Aleaxander Sverdlin <alexander.sverdlin@nokia.com>

> ---
> Changes in v2:
> - None
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 828d03edc0a3..0aa1b1035b4b 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -159,7 +159,7 @@ static int read_cr(struct spi_nor *nor)
>   * Write status register 1 byte
>   * Returns negative if error occurred.
>   */
> -static inline int write_sr(struct spi_nor *nor, u8 val)
> +static int write_sr(struct spi_nor *nor, u8 val)
>  {
>  	nor->cmd_buf[0] = val;
>  	return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1);
> @@ -169,7 +169,7 @@ static inline int write_sr(struct spi_nor *nor, u8 val)
>   * Set write enable latch with Write Enable command.
>   * Returns negative if error occurred.
>   */
> -static inline int write_enable(struct spi_nor *nor)
> +static int write_enable(struct spi_nor *nor)
>  {
>  	return nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
>  }
> @@ -177,12 +177,12 @@ static inline int write_enable(struct spi_nor *nor)
>  /*
>   * Send write disable instruction to the chip.
>   */
> -static inline int write_disable(struct spi_nor *nor)
> +static int write_disable(struct spi_nor *nor)
>  {
>  	return nor->write_reg(nor, SPINOR_OP_WRDI, NULL, 0);
>  }
>  
> -static inline struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
> +static struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
>  {
>  	return mtd->priv;
>  }
> @@ -200,7 +200,7 @@ static u8 spi_nor_convert_opcode(u8 opcode, const u8 table[][2], size_t size)
>  	return opcode;
>  }
>  
> -static inline u8 spi_nor_convert_3to4_read(u8 opcode)
> +static u8 spi_nor_convert_3to4_read(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_read[][2] = {
>  		{ SPINOR_OP_READ,	SPINOR_OP_READ_4B },
> @@ -219,7 +219,7 @@ static inline u8 spi_nor_convert_3to4_read(u8 opcode)
>  				      ARRAY_SIZE(spi_nor_3to4_read));
>  }
>  
> -static inline u8 spi_nor_convert_3to4_program(u8 opcode)
> +static u8 spi_nor_convert_3to4_program(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_program[][2] = {
>  		{ SPINOR_OP_PP,		SPINOR_OP_PP_4B },
> @@ -231,7 +231,7 @@ static inline u8 spi_nor_convert_3to4_program(u8 opcode)
>  				      ARRAY_SIZE(spi_nor_3to4_program));
>  }
>  
> -static inline u8 spi_nor_convert_3to4_erase(u8 opcode)
> +static u8 spi_nor_convert_3to4_erase(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_erase[][2] = {
>  		{ SPINOR_OP_BE_4K,	SPINOR_OP_BE_4K_4B },
> @@ -276,8 +276,8 @@ static void spi_nor_set_4byte_opcodes(struct spi_nor *nor,
>  }
>  
>  /* Enable/disable 4-byte addressing mode. */
> -static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
> -			    int enable)
> +static int set_4byte(struct spi_nor *nor, const struct flash_info *info,
> +		     int enable)
>  {
>  	int status;
>  	bool need_wren = false;
> @@ -335,7 +335,7 @@ static int s3an_sr_ready(struct spi_nor *nor)
>  	return !!(val & XSR_RDY);
>  }
>  
> -static inline int spi_nor_sr_ready(struct spi_nor *nor)
> +static int spi_nor_sr_ready(struct spi_nor *nor)
>  {
>  	int sr = read_sr(nor);
>  	if (sr < 0)
> @@ -354,7 +354,7 @@ static inline int spi_nor_sr_ready(struct spi_nor *nor)
>  	return !(sr & SR_WIP);
>  }
>  
> -static inline int spi_nor_fsr_ready(struct spi_nor *nor)
> +static int spi_nor_fsr_ready(struct spi_nor *nor)
>  {
>  	int fsr = read_fsr(nor);
>  	if (fsr < 0)
> @@ -2372,7 +2372,7 @@ struct sfdp_bfpt {
>  
>  /* Fast Read settings. */
>  
> -static inline void
> +static void
>  spi_nor_set_read_settings_from_bfpt(struct spi_nor_read_command *read,
>  				    u16 half,
>  				    enum spi_nor_protocol proto)
Tudor Ambarus Dec. 4, 2018, 5:01 p.m. UTC | #2
On 11/29/2018 04:10 PM, Boris Brezillon wrote:
> gcc should be smart enough to decide when inlining a function makes
> sense. Drop all inline specifiers.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>

Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>

> ---
> Changes in v2:
> - None
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 828d03edc0a3..0aa1b1035b4b 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -159,7 +159,7 @@ static int read_cr(struct spi_nor *nor)
>   * Write status register 1 byte
>   * Returns negative if error occurred.
>   */
> -static inline int write_sr(struct spi_nor *nor, u8 val)
> +static int write_sr(struct spi_nor *nor, u8 val)
>  {
>  	nor->cmd_buf[0] = val;
>  	return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1);
> @@ -169,7 +169,7 @@ static inline int write_sr(struct spi_nor *nor, u8 val)
>   * Set write enable latch with Write Enable command.
>   * Returns negative if error occurred.
>   */
> -static inline int write_enable(struct spi_nor *nor)
> +static int write_enable(struct spi_nor *nor)
>  {
>  	return nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
>  }
> @@ -177,12 +177,12 @@ static inline int write_enable(struct spi_nor *nor)
>  /*
>   * Send write disable instruction to the chip.
>   */
> -static inline int write_disable(struct spi_nor *nor)
> +static int write_disable(struct spi_nor *nor)
>  {
>  	return nor->write_reg(nor, SPINOR_OP_WRDI, NULL, 0);
>  }
>  
> -static inline struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
> +static struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
>  {
>  	return mtd->priv;
>  }
> @@ -200,7 +200,7 @@ static u8 spi_nor_convert_opcode(u8 opcode, const u8 table[][2], size_t size)
>  	return opcode;
>  }
>  
> -static inline u8 spi_nor_convert_3to4_read(u8 opcode)
> +static u8 spi_nor_convert_3to4_read(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_read[][2] = {
>  		{ SPINOR_OP_READ,	SPINOR_OP_READ_4B },
> @@ -219,7 +219,7 @@ static inline u8 spi_nor_convert_3to4_read(u8 opcode)
>  				      ARRAY_SIZE(spi_nor_3to4_read));
>  }
>  
> -static inline u8 spi_nor_convert_3to4_program(u8 opcode)
> +static u8 spi_nor_convert_3to4_program(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_program[][2] = {
>  		{ SPINOR_OP_PP,		SPINOR_OP_PP_4B },
> @@ -231,7 +231,7 @@ static inline u8 spi_nor_convert_3to4_program(u8 opcode)
>  				      ARRAY_SIZE(spi_nor_3to4_program));
>  }
>  
> -static inline u8 spi_nor_convert_3to4_erase(u8 opcode)
> +static u8 spi_nor_convert_3to4_erase(u8 opcode)
>  {
>  	static const u8 spi_nor_3to4_erase[][2] = {
>  		{ SPINOR_OP_BE_4K,	SPINOR_OP_BE_4K_4B },
> @@ -276,8 +276,8 @@ static void spi_nor_set_4byte_opcodes(struct spi_nor *nor,
>  }
>  
>  /* Enable/disable 4-byte addressing mode. */
> -static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
> -			    int enable)
> +static int set_4byte(struct spi_nor *nor, const struct flash_info *info,
> +		     int enable)
>  {
>  	int status;
>  	bool need_wren = false;
> @@ -335,7 +335,7 @@ static int s3an_sr_ready(struct spi_nor *nor)
>  	return !!(val & XSR_RDY);
>  }
>  
> -static inline int spi_nor_sr_ready(struct spi_nor *nor)
> +static int spi_nor_sr_ready(struct spi_nor *nor)
>  {
>  	int sr = read_sr(nor);
>  	if (sr < 0)
> @@ -354,7 +354,7 @@ static inline int spi_nor_sr_ready(struct spi_nor *nor)
>  	return !(sr & SR_WIP);
>  }
>  
> -static inline int spi_nor_fsr_ready(struct spi_nor *nor)
> +static int spi_nor_fsr_ready(struct spi_nor *nor)
>  {
>  	int fsr = read_fsr(nor);
>  	if (fsr < 0)
> @@ -2372,7 +2372,7 @@ struct sfdp_bfpt {
>  
>  /* Fast Read settings. */
>  
> -static inline void
> +static void
>  spi_nor_set_read_settings_from_bfpt(struct spi_nor_read_command *read,
>  				    u16 half,
>  				    enum spi_nor_protocol proto)
>
diff mbox series

Patch

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 828d03edc0a3..0aa1b1035b4b 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -159,7 +159,7 @@  static int read_cr(struct spi_nor *nor)
  * Write status register 1 byte
  * Returns negative if error occurred.
  */
-static inline int write_sr(struct spi_nor *nor, u8 val)
+static int write_sr(struct spi_nor *nor, u8 val)
 {
 	nor->cmd_buf[0] = val;
 	return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1);
@@ -169,7 +169,7 @@  static inline int write_sr(struct spi_nor *nor, u8 val)
  * Set write enable latch with Write Enable command.
  * Returns negative if error occurred.
  */
-static inline int write_enable(struct spi_nor *nor)
+static int write_enable(struct spi_nor *nor)
 {
 	return nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
 }
@@ -177,12 +177,12 @@  static inline int write_enable(struct spi_nor *nor)
 /*
  * Send write disable instruction to the chip.
  */
-static inline int write_disable(struct spi_nor *nor)
+static int write_disable(struct spi_nor *nor)
 {
 	return nor->write_reg(nor, SPINOR_OP_WRDI, NULL, 0);
 }
 
-static inline struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
+static struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
 {
 	return mtd->priv;
 }
@@ -200,7 +200,7 @@  static u8 spi_nor_convert_opcode(u8 opcode, const u8 table[][2], size_t size)
 	return opcode;
 }
 
-static inline u8 spi_nor_convert_3to4_read(u8 opcode)
+static u8 spi_nor_convert_3to4_read(u8 opcode)
 {
 	static const u8 spi_nor_3to4_read[][2] = {
 		{ SPINOR_OP_READ,	SPINOR_OP_READ_4B },
@@ -219,7 +219,7 @@  static inline u8 spi_nor_convert_3to4_read(u8 opcode)
 				      ARRAY_SIZE(spi_nor_3to4_read));
 }
 
-static inline u8 spi_nor_convert_3to4_program(u8 opcode)
+static u8 spi_nor_convert_3to4_program(u8 opcode)
 {
 	static const u8 spi_nor_3to4_program[][2] = {
 		{ SPINOR_OP_PP,		SPINOR_OP_PP_4B },
@@ -231,7 +231,7 @@  static inline u8 spi_nor_convert_3to4_program(u8 opcode)
 				      ARRAY_SIZE(spi_nor_3to4_program));
 }
 
-static inline u8 spi_nor_convert_3to4_erase(u8 opcode)
+static u8 spi_nor_convert_3to4_erase(u8 opcode)
 {
 	static const u8 spi_nor_3to4_erase[][2] = {
 		{ SPINOR_OP_BE_4K,	SPINOR_OP_BE_4K_4B },
@@ -276,8 +276,8 @@  static void spi_nor_set_4byte_opcodes(struct spi_nor *nor,
 }
 
 /* Enable/disable 4-byte addressing mode. */
-static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
-			    int enable)
+static int set_4byte(struct spi_nor *nor, const struct flash_info *info,
+		     int enable)
 {
 	int status;
 	bool need_wren = false;
@@ -335,7 +335,7 @@  static int s3an_sr_ready(struct spi_nor *nor)
 	return !!(val & XSR_RDY);
 }
 
-static inline int spi_nor_sr_ready(struct spi_nor *nor)
+static int spi_nor_sr_ready(struct spi_nor *nor)
 {
 	int sr = read_sr(nor);
 	if (sr < 0)
@@ -354,7 +354,7 @@  static inline int spi_nor_sr_ready(struct spi_nor *nor)
 	return !(sr & SR_WIP);
 }
 
-static inline int spi_nor_fsr_ready(struct spi_nor *nor)
+static int spi_nor_fsr_ready(struct spi_nor *nor)
 {
 	int fsr = read_fsr(nor);
 	if (fsr < 0)
@@ -2372,7 +2372,7 @@  struct sfdp_bfpt {
 
 /* Fast Read settings. */
 
-static inline void
+static void
 spi_nor_set_read_settings_from_bfpt(struct spi_nor_read_command *read,
 				    u16 half,
 				    enum spi_nor_protocol proto)