Patchwork mtd: Replace the dangerous to_fsl_upm_nand macro with an inline function

login
register
mail settings
Submitter Ferenc Wagner
Date March 23, 2010, 5:08 p.m.
Message ID <87iq8n0xvj.fsf@tac.ki.iif.hu>
Download mbox | patch
Permalink /patch/48356/
State New
Headers show

Comments

Ferenc Wagner - March 23, 2010, 5:08 p.m.
The original macro worked only when applied to variables named 'mtd'.
While this could have been fixed by simply renaming the macro argument,
a more type-safe replacement is preferred.

Signed-off-by: Ferenc Wagner <wferi@niif.hu>
---
 drivers/mtd/nand/fsl_upm.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Artem Bityutskiy - April 8, 2010, 8:32 a.m.
On Tue, 2010-03-23 at 18:08 +0100, Ferenc Wagner wrote:
> The original macro worked only when applied to variables named 'mtd'.
> While this could have been fixed by simply renaming the macro argument,
> a more type-safe replacement is preferred.
> 
> Signed-off-by: Ferenc Wagner <wferi@niif.hu>

Pushed this and the other similar patch of yours to my l2-mtd-2.6.git /
master, thanks!

Patch

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 071a60c..02d1688 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -48,7 +48,10 @@  struct fsl_upm_nand {
 	uint32_t wait_flags;
 };
 
-#define to_fsl_upm_nand(mtd) container_of(mtd, struct fsl_upm_nand, mtd)
+inline struct fsl_upm_nand *to_fsl_upm_nand(struct mtd_info *mtdinfo)
+{
+	return container_of(mtdinfo, struct fsl_upm_nand, mtd);
+}
 
 static int fun_chip_ready(struct mtd_info *mtd)
 {