lkml.org 
[lkml]   [2013]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/33] mfd: Convert to devm_ioremap_resource()
    Date
    Convert all uses of devm_request_and_ioremap() to the newly introduced
    devm_ioremap_resource() which provides more consistent error handling.

    devm_ioremap_resource() provides its own error messages so all explicit
    error messages can be removed from the failure code paths.

    Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
    Cc: Samuel Ortiz <sameo@linux.intel.com>
    ---
    drivers/mfd/intel_msic.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
    index ab8d0b2..1804331 100644
    --- a/drivers/mfd/intel_msic.c
    +++ b/drivers/mfd/intel_msic.c
    @@ -9,6 +9,7 @@
    * published by the Free Software Foundation.
    */

    +#include <linux/err.h>
    #include <linux/gpio.h>
    #include <linux/io.h>
    #include <linux/module.h>
    @@ -424,11 +425,9 @@ static int intel_msic_probe(struct platform_device *pdev)
    return -ENODEV;
    }

    - msic->irq_base = devm_request_and_ioremap(&pdev->dev, res);
    - if (!msic->irq_base) {
    - dev_err(&pdev->dev, "failed to map SRAM memory\n");
    - return -ENOMEM;
    - }
    + msic->irq_base = devm_ioremap_resource(&pdev->dev, res);
    + if (IS_ERR(msic->irq_base))
    + return PTR_ERR(msic->irq_base);

    platform_set_drvdata(pdev, msic);

    --
    1.8.1.1


    \
     
     \ /
      Last update: 2013-01-21 16:21    [W:5.780 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site