diff --git a/[refs] b/[refs]
index 5000a1175584..12cd80f4cd7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8467afec5f8137fd0c13121f8a38c99c54c913f6
+refs/heads/master: 4ddb8ae217ad2aae888d00d97c5160f677dd38f4
diff --git a/trunk/drivers/gpio/basic_mmio_gpio.c b/trunk/drivers/gpio/basic_mmio_gpio.c
index e935a24f7d29..5db5de438324 100644
--- a/trunk/drivers/gpio/basic_mmio_gpio.c
+++ b/trunk/drivers/gpio/basic_mmio_gpio.c
@@ -296,7 +296,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
 	else
 		bgc->gc.base = -1;
 
-	dev_set_drvdata(dev, bgc);
+	platform_set_drvdata(pdev, bgc);
 
 	ret = gpiochip_add(&bgc->gc);
 	if (ret)
@@ -307,7 +307,7 @@ static int __devinit bgpio_probe(struct platform_device *pdev)
 
 static int __devexit bgpio_remove(struct platform_device *pdev)
 {
-	struct bgpio_chip *bgc = dev_get_drvdata(&pdev->dev);
+	struct bgpio_chip *bgc = platform_get_drvdata(pdev);
 
 	return gpiochip_remove(&bgc->gc);
 }