|
@@ -885,22 +885,9 @@ static int sahara_probe(struct platform_device *pdev)
|
|
|
|
|
|
/* Get the base address */
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- if (!res) {
|
|
|
- dev_err(&pdev->dev, "failed to get memory region resource\n");
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
-
|
|
|
- if (devm_request_mem_region(&pdev->dev, res->start,
|
|
|
- resource_size(res), SAHARA_NAME) == NULL) {
|
|
|
- dev_err(&pdev->dev, "failed to request memory region\n");
|
|
|
- return -ENOENT;
|
|
|
- }
|
|
|
- dev->regs_base = devm_ioremap(&pdev->dev, res->start,
|
|
|
- resource_size(res));
|
|
|
- if (!dev->regs_base) {
|
|
|
- dev_err(&pdev->dev, "failed to ioremap address region\n");
|
|
|
- return -ENOENT;
|
|
|
- }
|
|
|
+ dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(dev->regs_base))
|
|
|
+ return PTR_ERR(dev->regs_base);
|
|
|
|
|
|
/* Get the IRQ */
|
|
|
irq = platform_get_irq(pdev, 0);
|