fpga: region: don't use drvdata in common fpga code

Changes to fpga_region_register function to not set drvdata.

Setting drvdata is fine for DT based devices that will have one region
per platform device.  However PCIe based devices may have multiple
FPGA regions under one PCIe device.  Without these changes, the PCIe
solution has to create an extra device for each child region to hold
drvdata.

Signed-off-by: Alan Tull <[email protected]>
Reported-by: Jiuyue Ma <[email protected]>
Signed-off-by: Moritz Fischer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index cb0603e07ff862f616e7f1cf721d24c15a0679e7..f634a8ed5e2c5f4bf1abae9eaec4525001d2e9d7 100644 (file)
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -183,7 +183,6 @@ int fpga_region_register(struct device *dev, struct fpga_region *region)
        region->dev.parent = dev;
        region->dev.of_node = dev->of_node;
        region->dev.id = id;
-       dev_set_drvdata(dev, region);
 
        ret = dev_set_name(&region->dev, "region%d", id);
        if (ret)

diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 119ff75522f13d10f10cf6595d5006e7d41bf0b3..35e7e8c4a0cb084ea3bbaf35747174a747e5e721 100644 (file)
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -438,6 +438,7 @@ static int of_fpga_region_probe(struct platform_device *pdev)
                goto eprobe_mgr_put;
 
        of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
+       dev_set_drvdata(dev, region);
 
        dev_info(dev, "FPGA Region probed\n");