From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + omap-return-ptr_err-rather-than-is_err.patch added to -mm tree Date: Mon, 23 Nov 2009 18:49:48 -0800 Message-ID: <200911240249.nAO2nm3n026292@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:55956 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757602AbZKXCtz (ORCPT ); Mon, 23 Nov 2009 21:49:55 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: roel.kluin@gmail.com, khilman@deeprootsystems.com, linux@arm.linux.org.uk, tony@atomide.com The patch titled omap: return PTR_ERR rather than IS_ERR has been added to the -mm tree. Its filename is omap-return-ptr_err-rather-than-is_err.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: omap: return PTR_ERR rather than IS_ERR From: Roel Kluin IS_ERR returns only 1 or 0, and the functions return a negative error in other cases anyways. Signed-off-by: Roel Kluin Cc: Tony Lindgren Cc: Russell King Cc: Kevin Hilman Signed-off-by: Andrew Morton --- arch/arm/mach-omap2/powerdomain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN arch/arm/mach-omap2/powerdomain.c~omap-return-ptr_err-rather-than-is_err arch/arm/mach-omap2/powerdomain.c --- a/arch/arm/mach-omap2/powerdomain.c~omap-return-ptr_err-rather-than-is_err +++ a/arch/arm/mach-omap2/powerdomain.c @@ -480,7 +480,7 @@ int pwrdm_add_wkdep(struct powerdomain * if (IS_ERR(p)) { pr_debug("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } pr_debug("powerdomain: hardware will wake up %s when %s wakes up\n", @@ -513,7 +513,7 @@ int pwrdm_del_wkdep(struct powerdomain * if (IS_ERR(p)) { pr_debug("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } pr_debug("powerdomain: hardware will no longer wake up %s after %s " @@ -550,7 +550,7 @@ int pwrdm_read_wkdep(struct powerdomain if (IS_ERR(p)) { pr_debug("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } return prm_read_mod_bits_shift(pwrdm1->prcm_offs, PM_WKDEP, @@ -584,7 +584,7 @@ int pwrdm_add_sleepdep(struct powerdomai pr_debug("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } pr_debug("powerdomain: will prevent %s from sleeping if %s is active\n", @@ -623,7 +623,7 @@ int pwrdm_del_sleepdep(struct powerdomai pr_debug("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } pr_debug("powerdomain: will no longer prevent %s from sleeping if " @@ -666,7 +666,7 @@ int pwrdm_read_sleepdep(struct powerdoma pr_debug("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n", pwrdm1->name, pwrdm2->name); - return IS_ERR(p); + return PTR_ERR(p); } return prm_read_mod_bits_shift(pwrdm1->prcm_offs, OMAP3430_CM_SLEEPDEP, _ Patches currently in -mm which might be from roel.kluin@gmail.com are thinkpad-acpi-fix-sign-of-erestartsys-return.patch linux-next.patch v4l-dvb-mxl5007tc-fix-test-in-copy_reg_bits.patch fujitsu-laptop-fix-tests-of-acpi_evaluate_integer-return.patch omap-return-ptr_err-rather-than-is_err.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch sms-cards-make-id-unsigned-in-sms_get_board.patch mtd-error-return-eio-instead-of-eio.patch jffs2-fix-min-max-confusion.patch imx-bit-confusion.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch ibmmca-buffer-overflow.patch scsi-eata-fix-buffer-overflow.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-u14-34fc-fix-uffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch zfcp-test-kmalloc-failure-in-scsi_get_vpd_page.patch st-fix-test-of-value-range-in-st_set_options.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch r8192u_core-test-for-negative-error-in-rtl8192_rx_isr.patch wusb-use-sizeof-struct-rather-than-pointer.patch page-types-unsigned-cannot-be-less-than-0-in-add_page.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch cryptocop-fix-assertion-in-create_output_descriptors.patch gpio-fix-test-on-unsigned-in-lnw_irq_type.patch fbdev-tv_paln-bit-set-twice-in-sisfb_detect_vb_connect.patch hvc_console-fix-test-on-unsigned-in-hvc_console_print.patch irq-fix-test-in-__exit-parport_mfc3_exit.patch zlib-optimize-inffast-when-copying-direct-from-output.patch