diff --git a/[refs] b/[refs]
index 803ddf8dfeb1..108f65545d5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98250221691f728b7cad6deed98866f8847e683f
+refs/heads/master: 2a7f51a3e08cdaeea78d9e101a0079422a55bbc3
diff --git a/trunk/include/linux/mfd/mcp.h b/trunk/include/linux/mfd/mcp.h
index ee496708e38b..f88c1cc0cb0f 100644
--- a/trunk/include/linux/mfd/mcp.h
+++ b/trunk/include/linux/mfd/mcp.h
@@ -64,6 +64,9 @@ void mcp_driver_unregister(struct mcp_driver *);
 #define mcp_get_drvdata(mcp)	dev_get_drvdata(&(mcp)->attached_device)
 #define mcp_set_drvdata(mcp,d)	dev_set_drvdata(&(mcp)->attached_device, d)
 
-#define mcp_priv(mcp)		((void *)((mcp)+1))
+static inline void *mcp_priv(struct mcp *mcp)
+{
+	return mcp + 1;
+}
 
 #endif