|
@@ -107,7 +107,6 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
|
|
|
struct platform_device *pdev = dev->platformdev;
|
|
|
struct rcar_du_platform_data *pdata = pdev->dev.platform_data;
|
|
|
struct rcar_du_device *rcdu;
|
|
|
- struct resource *ioarea;
|
|
|
struct resource *mem;
|
|
|
int ret;
|
|
|
|
|
@@ -129,24 +128,9 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
|
|
|
|
|
|
/* I/O resources and clocks */
|
|
|
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- if (mem == NULL) {
|
|
|
- dev_err(&pdev->dev, "failed to get memory resource\n");
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- ioarea = devm_request_mem_region(&pdev->dev, mem->start,
|
|
|
- resource_size(mem), pdev->name);
|
|
|
- if (ioarea == NULL) {
|
|
|
- dev_err(&pdev->dev, "failed to request memory region\n");
|
|
|
- return -EBUSY;
|
|
|
- }
|
|
|
-
|
|
|
- rcdu->mmio = devm_ioremap_nocache(&pdev->dev, ioarea->start,
|
|
|
- resource_size(ioarea));
|
|
|
- if (rcdu->mmio == NULL) {
|
|
|
- dev_err(&pdev->dev, "failed to remap memory resource\n");
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
+ rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
|
|
|
+ if (IS_ERR(rcdu->mmio))
|
|
|
+ return PTR_ERR(rcdu->mmio);
|
|
|
|
|
|
rcdu->clock = devm_clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(rcdu->clock)) {
|