[PATCH] gpio: pl061: drop extra check for NULL platform_data

Rob Herring robherring2 at gmail.com
Fri Dec 9 17:56:08 EST 2011

From: Rob Herring <rob.herring at calxeda.com>

In adding DT binding support, the check for NULL platform_data got added
back in inadvertently, so remove it.

Signed-off-by: Rob Herring <rob.herring at calxeda.com>
Linus or Grant, 

Can you apply this fix for 3.2-rc.


 drivers/gpio/gpio-pl061.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 093c90b..4102f63 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -238,10 +238,6 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
 	int ret, irq, i;
 	static DECLARE_BITMAP(init_irq, NR_IRQS);
-	pdata = dev->dev.platform_data;
-	if (pdata == NULL)
-		return -ENODEV;
 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 	if (chip == NULL)
 		return -ENOMEM;

More information about the linux-arm-kernel mailing list