From c25874a94030bd56e084d419d54b71fcf3ba30d5 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 16 Apr 2012 17:01:31 +1000
Subject: [PATCH] --- yaml --- r: 302655 b: refs/heads/master c:
 df1a000e767f54a539f4d2d663130d063f5208ea h: refs/heads/master i:   302653:
 3316464e4292900f751f800ac6fa2483c129e31e   302651:
 968519eb8f9df1ba52e29c78fbe478d096e531a6   302647:
 1a38689a04e0112cd226c4c407fe6569ea50241f   302639:
 bfc6691fc00c8972959d7a4b2f7b96b1b105fd7c   302623:
 c06b121736a4f98fe5ded869db1906acde812ceb   302591:
 db5811eafef9bd2b38c4b7e71b1ad6ba4d3d3404 v: v3

---
 [refs]                               |  2 +-
 trunk/arch/m68k/platform/5307/gpio.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 04984f1c7848..eb35fa6e5203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c222f5f41fca51a4639d88a940f9283d04ba2c0c
+refs/heads/master: df1a000e767f54a539f4d2d663130d063f5208ea
diff --git a/trunk/arch/m68k/platform/5307/gpio.c b/trunk/arch/m68k/platform/5307/gpio.c
index 5850612b4a38..91d042030657 100644
--- a/trunk/arch/m68k/platform/5307/gpio.c
+++ b/trunk/arch/m68k/platform/5307/gpio.c
@@ -21,21 +21,7 @@
 #include <asm/mcfgpio.h>
 
 static struct mcf_gpio_chip mcf_gpio_chips[] = {
-	{
-		.gpio_chip			= {
-			.label			= "PP",
-			.request		= mcf_gpio_request,
-			.free			= mcf_gpio_free,
-			.direction_input	= mcf_gpio_direction_input,
-			.direction_output	= mcf_gpio_direction_output,
-			.get			= mcf_gpio_get_value,
-			.set			= mcf_gpio_set_value,
-			.ngpio			= 16,
-		},
-		.pddr				= (void __iomem *) MCFSIM_PADDR,
-		.podr				= (void __iomem *) MCFSIM_PADAT,
-		.ppdr				= (void __iomem *) MCFSIM_PADAT,
-	},
+	MCFGPS(PP, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
 };
 
 static int __init mcf_gpio_init(void)