diff options
| author | Moritz Fischer <mdf@kernel.org> | 2019-09-03 19:35:07 -0700 |
|---|---|---|
| committer | Moritz Fischer <mdf@kernel.org> | 2019-09-03 19:35:07 -0700 |
| commit | af9ca4b0bd0502bb134f18d394a613be371d2352 (patch) | |
| tree | 37b1159d4456e223981dddde4795f2061c83d14c /drivers/w1/masters/omap_hdq.c | |
| parent | cbb4a74478e9eef0f8ef437e95ef7645008988f7 (diff) | |
| parent | 99097a214b0c15f7595ac8f2788662f3941c1992 (diff) | |
| download | kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.gz kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.bz2 kernel_replicant_linux-af9ca4b0bd0502bb134f18d394a613be371d2352.zip | |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into fpga-dfl-for-5.4
Diffstat (limited to 'drivers/w1/masters/omap_hdq.c')
| -rw-r--r-- | drivers/w1/masters/omap_hdq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index 3099052e1243..4164045866b3 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c @@ -660,7 +660,6 @@ static int omap_hdq_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct hdq_data *hdq_data; - struct resource *res; int ret, irq; u8 rev; const char *mode; @@ -674,8 +673,7 @@ static int omap_hdq_probe(struct platform_device *pdev) hdq_data->dev = dev; platform_set_drvdata(pdev, hdq_data); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - hdq_data->hdq_base = devm_ioremap_resource(dev, res); + hdq_data->hdq_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hdq_data->hdq_base)) return PTR_ERR(hdq_data->hdq_base); |