2018-11-12 19:40:46

by Alan Tull

Subject: [RESEND 0/2] fpga fixes for 4.20

Hi Greg,

Here's a reposting of the two small fixes for fpga, please
take them in. They've been reviewed on the mailing list
and apply cleanly on today's char-misc-test.

Thanks,
Alan

Moritz Fischer (2):
fpga: of-fpga-region: Use platform_set_drvdata
fpga: dfl-fme-region: Use platform_get_drvdata()

drivers/fpga/dfl-fme-region.c | 2 +-
drivers/fpga/of-fpga-region.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--
2.7.4

2018-11-12 19:39:22

by Alan Tull

Subject: [RESEND 2/2] fpga: dfl-fme-region: Use platform_get_drvdata()

From: Moritz Fischer <[email protected]>

Use platform_get_drvdata() in remove() function of
the platform driver rather than dev_get_drvdata()
to match the platform_set_drvdata in the probe().

Signed-off-by: Moritz Fischer <[email protected]>
Acked-by: Alan Tull <[email protected]>
---
drivers/fpga/dfl-fme-region.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c
index ec134ec..1eeb42a 100644
--- a/drivers/fpga/dfl-fme-region.c
+++ b/drivers/fpga/dfl-fme-region.c
@@ -64,7 +64,7 @@ static int fme_region_probe(struct platform_device *pdev)

static int fme_region_remove(struct platform_device *pdev)
{
- struct fpga_region *region = dev_get_drvdata(&pdev->dev);
+ struct fpga_region *region = platform_get_drvdata(pdev);
struct fpga_manager *mgr = region->mgr;

fpga_region_unregister(region);
--
2.7.4

2018-11-12 19:39:27

by Alan Tull

Subject: [RESEND 1/2] fpga: of-fpga-region: Use platform_set_drvdata

From: Moritz Fischer <[email protected]>

Use platform_set_drvdata rather than dev_set_drvdata
to match the platform_get_drvdata in the _remove()
function of the platform driver.

Signed-off-by: Moritz Fischer <[email protected]>
Acked-by: Alan Tull <[email protected]>
---
drivers/fpga/of-fpga-region.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 122286f..75f64ab 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -421,7 +421,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);
+ platform_set_drvdata(pdev, region);

dev_info(dev, "FPGA Region probed\n");

--
2.7.4

2018-11-12 19:47:59

by Greg Kroah-Hartman

Subject: Re: [RESEND 0/2] fpga fixes for 4.20

On Mon, Nov 12, 2018 at 01:38:32PM -0600, Alan Tull wrote:
> Hi Greg,
>
> Here's a reposting of the two small fixes for fpga, please
> take them in. They've been reviewed on the mailing list
> and apply cleanly on today's char-misc-test.

This isn't a bugfix, they should just go into my "next" branch to be
merged for the next -rc1 release, right? I thought that is what I said
last time...

thanks,

greg k-h