From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + rtc-rtc-jz4740-use-devm_-functions.patch added to -mm tree Date: Tue, 28 May 2013 15:22:03 -0700 Message-ID: <51a52e0b.pufDuM++YUROEDhj%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33369 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758099Ab3E1WWE (ORCPT ); Tue, 28 May 2013 18:22:04 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, jg1.han@samsung.com Subject: + rtc-rtc-jz4740-use-devm_-functions.patch added to -mm tree To: jg1.han@samsung.com From: akpm@linux-foundation.org Date: Tue, 28 May 2013 15:22:03 -0700 The patch titled Subject: rtc: rtc-jz4740: use devm_*() functions has been added to the -mm tree. Its filename is rtc-rtc-jz4740-use-devm_-functions.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jingoo Han Subject: rtc: rtc-jz4740: use devm_*() functions Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton --- drivers/rtc/rtc-jz4740.c | 65 +++++++++---------------------------- 1 file changed, 16 insertions(+), 49 deletions(-) diff -puN drivers/rtc/rtc-jz4740.c~rtc-rtc-jz4740-use-devm_-functions drivers/rtc/rtc-jz4740.c --- a/drivers/rtc/rtc-jz4740.c~rtc-rtc-jz4740-use-devm_-functions +++ a/drivers/rtc/rtc-jz4740.c @@ -14,6 +14,7 @@ * */ +#include #include #include #include @@ -216,37 +217,34 @@ static int jz4740_rtc_probe(struct platf struct jz4740_rtc *rtc; uint32_t scratchpad; - rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); if (!rtc) return -ENOMEM; rtc->irq = platform_get_irq(pdev, 0); if (rtc->irq < 0) { - ret = -ENOENT; dev_err(&pdev->dev, "Failed to get platform irq\n"); - goto err_free; + return -ENOENT; } rtc->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!rtc->mem) { - ret = -ENOENT; dev_err(&pdev->dev, "Failed to get platform mmio memory\n"); - goto err_free; + return -ENOENT; } - rtc->mem = request_mem_region(rtc->mem->start, resource_size(rtc->mem), - pdev->name); + rtc->mem = devm_request_mem_region(&pdev->dev, rtc->mem->start, + resource_size(rtc->mem), pdev->name); if (!rtc->mem) { - ret = -EBUSY; dev_err(&pdev->dev, "Failed to request mmio memory region\n"); - goto err_free; + return -EBUSY; } - rtc->base = ioremap_nocache(rtc->mem->start, resource_size(rtc->mem)); + rtc->base = devm_ioremap_nocache(&pdev->dev, rtc->mem->start, + resource_size(rtc->mem)); if (!rtc->base) { - ret = -EBUSY; dev_err(&pdev->dev, "Failed to ioremap mmio memory\n"); - goto err_release_mem_region; + return -EBUSY; } spin_lock_init(&rtc->lock); @@ -255,19 +253,19 @@ static int jz4740_rtc_probe(struct platf device_init_wakeup(&pdev->dev, 1); - rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, &jz4740_rtc_ops, - THIS_MODULE); + rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, + &jz4740_rtc_ops, THIS_MODULE); if (IS_ERR(rtc->rtc)) { ret = PTR_ERR(rtc->rtc); dev_err(&pdev->dev, "Failed to register rtc device: %d\n", ret); - goto err_iounmap; + return ret; } - ret = request_irq(rtc->irq, jz4740_rtc_irq, 0, + ret = devm_request_irq(&pdev->dev, rtc->irq, jz4740_rtc_irq, 0, pdev->name, rtc); if (ret) { dev_err(&pdev->dev, "Failed to request rtc irq: %d\n", ret); - goto err_unregister_rtc; + return ret; } scratchpad = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SCRATCHPAD); @@ -276,43 +274,13 @@ static int jz4740_rtc_probe(struct platf ret = jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC, 0); if (ret) { dev_err(&pdev->dev, "Could not write write to RTC registers\n"); - goto err_free_irq; + return ret; } } return 0; - -err_free_irq: - free_irq(rtc->irq, rtc); -err_unregister_rtc: - rtc_device_unregister(rtc->rtc); -err_iounmap: - iounmap(rtc->base); -err_release_mem_region: - release_mem_region(rtc->mem->start, resource_size(rtc->mem)); -err_free: - kfree(rtc); - - return ret; } -static int jz4740_rtc_remove(struct platform_device *pdev) -{ - struct jz4740_rtc *rtc = platform_get_drvdata(pdev); - - free_irq(rtc->irq, rtc); - - rtc_device_unregister(rtc->rtc); - - iounmap(rtc->base); - release_mem_region(rtc->mem->start, resource_size(rtc->mem)); - - kfree(rtc); - - return 0; -} - - #ifdef CONFIG_PM static int jz4740_rtc_suspend(struct device *dev) { @@ -344,7 +312,6 @@ static const struct dev_pm_ops jz4740_pm static struct platform_driver jz4740_rtc_driver = { .probe = jz4740_rtc_probe, - .remove = jz4740_rtc_remove, .driver = { .name = "jz4740-rtc", .owner = THIS_MODULE, _ Patches currently in -mm which might be from jg1.han@samsung.com are linux-next.patch backlight-atmel-pwm-bl-remove-unnecessary-platform_set_drvdata.patch backlight-ep93xx-remove-unnecessary-platform_set_drvdata.patch backlight-lp8788-remove-unnecessary-platform_set_drvdata.patch backlight-pcf50633-remove-unnecessary-platform_set_drvdata.patch backlight-add-devm_backlight_device_registerunregister.patch lcd-add-devm_lcd_device_registerunregister.patch maintainers-add-backlight-subsystem-co-maintainer.patch rtc-rtc-88pm80x-remove-unnecessary-platform_set_drvdata.patch drivers-rtc-rtc-v3020c-remove-redundant-goto.patch drivers-rtc-interfacec-fix-checkpatch-errors.patch drivers-rtc-rtc-at32ap700xc-fix-checkpatch-error.patch drivers-rtc-rtc-at91rm9200c-include-linux-uaccessh.patch drivers-rtc-rtc-cmosc-fix-whitespace-related-errors.patch drivers-rtc-rtc-davincic-fix-whitespace-warning.patch drivers-rtc-rtc-ds1305c-add-missing-braces-around-sizeof.patch drivers-rtc-rtc-ds1374c-fix-spacing-related-issues.patch drivers-rtc-rtc-ds1511c-fix-issues-related-to-spaces-and-braces.patch drivers-rtc-rtc-ds3234c-fix-whitespace-issue.patch drivers-rtc-rtc-fm3130c-fix-whitespace-related-issue.patch drivers-rtc-rtc-m41t80c-fix-spacing-related-issue.patch drivers-rtc-rtc-max6902c-remove-unwanted-spaces.patch drivers-rtc-rtc-max77686c-remove-space-before-semicolon.patch drivers-rtc-rtc-max8997c-remove-space-before-semicolon.patch drivers-rtc-rtc-mpc5121c-remove-space-before-tab.patch drivers-rtc-rtc-msm6242c-use-pr_warn.patch drivers-rtc-rtc-mxcc-fix-checkpatch-error.patch drivers-rtc-rtc-omapc-include-linux-ioh-instead-of-asm-ioh.patch drivers-rtc-rtc-pcf2123c-remove-space-before-tabs.patch drivers-rtc-rtc-pcf8583c-move-assignment-outside-if-condition.patch drivers-rtc-rtc-rs5c313c-include-linux-ioh-instead-of-asm-ioh.patch drivers-rtc-rtc-rs5c313c-fix-spacing-related-issues.patch drivers-rtc-rtc-v3020c-fix-spacing-issues.patch drivers-rtc-rtc-vr41xxc-fix-spacing-issues.patch drivers-rtc-rtc-x1205c-fix-checkpatch-issues.patch rtc-rtc-88pm860x-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-ab3100-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-ab8500-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-at32ap700x-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-at91rm9200-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-at91sam9-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-au1xxx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-bfin-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-bq4802-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-coh901331-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-da9052-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-da9055-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-davinci-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-dm355evm-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-ds1302-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-ep93xx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-jz4740-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-lp8788-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-lpc32xx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-ls1x-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-m48t59-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-max8925-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-max8998-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-mc13xxx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-msm6242-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-mxc-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-nuc900-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-pcap-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-pm8xxx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-s3c-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-sa1100-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-sh-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-spear-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-stmp3xxx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-twl-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-vr41xx-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-vt8500-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-m48t86-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-puv3-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-rp5c01-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-tile-remove-unnecessary-platform_set_drvdata.patch rtc-rtc-hid-sensor-time-allow-full-years-16bit-in-hid-reports.patch rtc-rtc-hid-sensor-time-allow-16-and-32-bit-values-for-all-attributes.patch rtc-rtc-hid-sensor-time-add-option-hctosys-to-set-time-at-boot.patch rtc-rtc-hid-sensor-time-add-support-for-milliseconds.patch rtc-rtc-ds1307-use-devm_-functions.patch rtc-rtc-jz4740-use-devm_-functions.patch rtc-rtc-mpc5121-use-devm_-functions.patch rtc-rtc-m48t59-use-devm_-functions.patch rtc-rtc-pm8xxx-use-devm_-functions.patch rtc-rtc-pxa-use-devm_-functions.patch rtc-rtc-rx8025-use-devm_-functions.patch rtc-rtc-sh-use-devm_-functions.patch