From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-sh@vger.kernel.org Subject: [PATCH v2 02/23] drm/rcar-du: Use devm_ioremap_resource() Date: Wed, 31 Jul 2013 13:21:46 +0000 [thread overview] Message-ID: <1375276927-20181-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1375276927-20181-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Replace the devm_request_mem_region() and devm_ioremap_nocache() calls with devm_ioremap_resource(). Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index dc0fe09..f776b1c 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -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)) { -- 1.8.1.5
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-sh@vger.kernel.org Subject: [PATCH v2 02/23] drm/rcar-du: Use devm_ioremap_resource() Date: Wed, 31 Jul 2013 15:21:46 +0200 [thread overview] Message-ID: <1375276927-20181-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1375276927-20181-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Replace the devm_request_mem_region() and devm_ioremap_nocache() calls with devm_ioremap_resource(). Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index dc0fe09..f776b1c 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -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)) { -- 1.8.1.5
next prev parent reply other threads:[~2013-07-31 13:21 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-31 13:21 [PATCH v2 00/23] R-Car DU DRM support for R8A7790 Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 01/23] drm/rcar-du: Add missing alpha plane register definitions Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart [this message] 2013-07-31 13:21 ` [PATCH v2 02/23] drm/rcar-du: Use devm_ioremap_resource() Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 03/23] drm/rcar-du: Add platform module device table Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 04/23] drm/rcar-du: Support per-CRTC clock and IRQ Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 05/23] drm/rcar-du: Clarify comment regarding plane Y source coordinate Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 06/23] drm/rcar-du: Split LVDS encoder and connector Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 07/23] drm/rcar-du: Split VGA " Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 08/23] drm/rcar-du: Merge LVDS and VGA encoder code Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 09/23] drm/rcar-du: Rename platform data fields to match what they describe Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 10/23] drm/rcar-du: Create rcar_du_planes structure Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 11/23] drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 12/23] drm/rcar-du: Introduce CRTCs groups Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 13/23] drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 14/23] drm/rcar-du: Remove register definitions for the second channel Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:21 ` [PATCH v2 15/23] drm/rcar-du: Move output routing configuration to group Laurent Pinchart 2013-07-31 13:21 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 16/23] drm/rcar-du: Add support for the R8A7790 DU Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 17/23] drm/rcar-du: Fix buffer pitch alignment for " Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 18/23] drm/rcar-du: Add support for multiple groups Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 19/23] drm/rcar-du: Add support for DEFR8 register Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 20/23] drm/rcar-du: Rework output routing support Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 21/23] drm/rcar-du: Configure RGB output routing to DPAD0 Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 22/23] drm/rcar-du: Add internal LVDS encoder support Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart 2013-07-31 13:22 ` [PATCH v2 23/23] drm/rcar-du: Add FBDEV emulation support Laurent Pinchart 2013-07-31 13:22 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1375276927-20181-3-git-send-email-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-sh@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.