|
@@ -20,6 +20,7 @@
|
|
|
#include <linux/completion.h>
|
|
|
#include <linux/delay.h>
|
|
|
#include <linux/dma-mapping.h>
|
|
|
+#include <linux/err.h>
|
|
|
#include <linux/errno.h>
|
|
|
#include <linux/fs.h>
|
|
|
#include <linux/interrupt.h>
|
|
@@ -2111,11 +2112,9 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
|
|
|
pcdev->max_width = pcdev->pdata->max_width ? : 2560;
|
|
|
pcdev->max_height = pcdev->pdata->max_height ? : 1920;
|
|
|
|
|
|
- base = devm_request_and_ioremap(&pdev->dev, res);
|
|
|
- if (!base) {
|
|
|
- dev_err(&pdev->dev, "Unable to ioremap CEU registers.\n");
|
|
|
- return -ENXIO;
|
|
|
- }
|
|
|
+ base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(base))
|
|
|
+ return PTR_ERR(base);
|
|
|
|
|
|
pcdev->irq = irq;
|
|
|
pcdev->base = base;
|