diff --git a/[refs] b/[refs]
index 85b30ff1ca8d..07e5ef5f35c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ebcebddffbf5c074e467c725aafbd21dfd46ed5
+refs/heads/master: 59c4dce13018b04275478e95b3929eca55afcdfb
diff --git a/trunk/drivers/leds/leds-gpio.c b/trunk/drivers/leds/leds-gpio.c
index 4043f7732e57..c392c1e95531 100644
--- a/trunk/drivers/leds/leds-gpio.c
+++ b/trunk/drivers/leds/leds-gpio.c
@@ -269,13 +269,13 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
 
 static int __devexit gpio_led_remove(struct platform_device *pdev)
 {
-	struct gpio_leds_priv *priv = dev_get_drvdata(&pdev->dev);
+	struct gpio_leds_priv *priv = platform_get_drvdata(pdev);
 	int i;
 
 	for (i = 0; i < priv->num_leds; i++)
 		delete_gpio_led(&priv->leds[i]);
 
-	dev_set_drvdata(&pdev->dev, NULL);
+	platform_set_drvdata(pdev, NULL);
 
 	return 0;
 }