From: Ferenc Wagner <wferi@niif.hu>
Date: Tue, 23 Mar 2010 17:08:16 +0000 (+0100)
Subject: mtd/nand/fsl_upm: Replace the dangerous to_fsl_upm_nand macro
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b92b5c41a05b69f56e3d5e92dce3dbb5f5f5cf81;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

mtd/nand/fsl_upm: Replace the dangerous to_fsl_upm_nand macro

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>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d721ec055cbf..b4e2ba47d7b5 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)
+static 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)
 {