scsi: spi: Fix sshdr use

[linux-block.git] / drivers / misc / xilinx_tmr_manager.c

diff --git a/drivers/misc/xilinx_tmr_manager.c b/drivers/misc/xilinx_tmr_manager.c
index 0ef55e06d3a0fffb094d2cff99aec3d8b548784f..03912a90fd9543300a5869105275836bc294015e 100644 (file)
--- a/drivers/misc/xilinx_tmr_manager.c
+++ b/drivers/misc/xilinx_tmr_manager.c
@@ -15,7 +15,8 @@
 
 #include <asm/xilinx_mb_manager.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
 
 /* TMR Manager Register offsets */
 #define XTMR_MANAGER_CR_OFFSET         0x0
@@ -170,8 +171,7 @@ static int xtmr_manager_probe(struct platform_device *pdev)
        if (!xtmr_manager)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       xtmr_manager->regs =  devm_ioremap_resource(&pdev->dev, res);
+       xtmr_manager->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(xtmr_manager->regs))
                return PTR_ERR(xtmr_manager->regs);