Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / drivers / mtd / devices / docg3.c

diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
index c594fe5..802d8f1 100644 (file)
--- a/drivers/mtd/devices/docg3.c
+++ b/drivers/mtd/devices/docg3.c
@@ -1470,8 +1470,7 @@ static struct docg3 *sysfs_dev2docg3(struct device *dev,
                                     struct device_attribute *attr)
 {
        int floor;
-       struct platform_device *pdev = to_platform_device(dev);
-       struct mtd_info **docg3_floors = platform_get_drvdata(pdev);
+       struct mtd_info **docg3_floors = dev_get_drvdata(dev);
 
        floor = attr->attr.name[1] - '0';
        if (floor < 0 || floor >= DOC_MAX_NBFLOORS)