From owner-svn-src-projects@FreeBSD.ORG Mon Apr 16 23:19:22 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA174106564A; Mon, 16 Apr 2012 23:19:22 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8AF7C8FC0C; Mon, 16 Apr 2012 23:19:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3GNJMaG055727; Mon, 16 Apr 2012 23:19:22 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3GNJMrw055721; Mon, 16 Apr 2012 23:19:22 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201204162319.q3GNJMrw055721@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Mon, 16 Apr 2012 23:19:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234361 - in projects/armv6/sys/arm/ti: . omap4 twl usb X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Apr 2012 23:19:22 -0000 Author: gonzo Date: Mon Apr 16 23:19:21 2012 New Revision: 234361 URL: http://svn.freebsd.org/changeset/base/234361 Log: Replace linux-style error code reporting to FreeBSD-way Modified: projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c projects/armv6/sys/arm/ti/ti_edma3.c projects/armv6/sys/arm/ti/ti_mmchs.c projects/armv6/sys/arm/ti/twl/twl_vreg.c projects/armv6/sys/arm/ti/usb/omap_ehci.c Modified: projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c ============================================================================== --- projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c Mon Apr 16 23:17:29 2012 (r234360) +++ projects/armv6/sys/arm/ti/omap4/omap4_prcm_clks.c Mon Apr 16 23:19:21 2012 (r234361) @@ -1275,7 +1275,7 @@ omap4_clk_hsusbhost_accessible(struct ti clksel_reg_off = L3INIT_CM2_OFFSET + 0x58; } else { - return (-EINVAL); + return (EINVAL); } clksel = bus_read_4(clk_mem_res, clksel_reg_off); @@ -1319,7 +1319,7 @@ omap4_clk_hsusbhost_set_source(struct ti else if (clkdev->id != USBP2_PHY_CLK) bit = 25; else - return (-EINVAL); + return (EINVAL); /* We need the CM_L3INIT_HSUSBHOST_CLKCTRL register in CM2 register set */ clk_mem_res = sc->sc_res[CM2_INSTANCE_MEM_REGION]; Modified: projects/armv6/sys/arm/ti/ti_edma3.c ============================================================================== --- projects/armv6/sys/arm/ti/ti_edma3.c Mon Apr 16 23:17:29 2012 (r234360) +++ projects/armv6/sys/arm/ti/ti_edma3.c Mon Apr 16 23:19:21 2012 (r234361) @@ -289,7 +289,7 @@ ti_edma3_enable_event_intr(unsigned int uint32_t reg; if (ch >= TI_EDMA3_NUM_DMA_CHS) - return (-EINVAL); + return (EINVAL); if (ch < 32) { ti_edma3_cc_wr_4(TI_EDMA3CC_S_IESR(0), 1 << ch); @@ -306,7 +306,7 @@ ti_edma3_request_dma_ch(unsigned int ch, uint32_t reg; if (ch >= TI_EDMA3_NUM_DMA_CHS) - return (-EINVAL); + return (EINVAL); /* Enable the DMA channel in the DRAE/DRAEH registers */ if (ch < 32) { @@ -340,7 +340,7 @@ ti_edma3_request_qdma_ch(unsigned int ch uint32_t reg; if (ch >= TI_EDMA3_NUM_DMA_CHS) - return (-EINVAL); + return (EINVAL); /* Enable the QDMA channel in the QRAE registers */ reg = ti_edma3_cc_rd_4(TI_EDMA3CC_QRAE(0)); @@ -365,7 +365,7 @@ int ti_edma3_enable_transfer_manual(unsigned int ch) { if (ch >= TI_EDMA3_NUM_DMA_CHS) - return (-EINVAL); + return (EINVAL); /* set corresponding bit in ESR/ESRH to set a event */ if (ch < 32) { @@ -381,7 +381,7 @@ int ti_edma3_enable_transfer_qdma(unsigned int ch) { if (ch >= TI_EDMA3_NUM_QDMA_CHS) - return (-EINVAL); + return (EINVAL); /* set corresponding bit in QEESR to enable QDMA event */ ti_edma3_cc_wr_4(TI_EDMA3CC_S_QEESR(0), (1 << ch)); @@ -393,7 +393,7 @@ int ti_edma3_enable_transfer_event(unsigned int ch) { if (ch >= TI_EDMA3_NUM_DMA_CHS) - return (-EINVAL); + return (EINVAL); /* Clear SECR(H) & EMCR(H) to clean any previous NULL request * and set corresponding bit in EESR to enable DMA event */ Modified: projects/armv6/sys/arm/ti/ti_mmchs.c ============================================================================== --- projects/armv6/sys/arm/ti/ti_mmchs.c Mon Apr 16 23:17:29 2012 (r234360) +++ projects/armv6/sys/arm/ti/ti_mmchs.c Mon Apr 16 23:19:21 2012 (r234361) @@ -1441,7 +1441,7 @@ ti_mmchs_init_dma_channels(struct ti_mmc sc->dma_rx_trig = TI_EDMA3_EVENT_SDRXEVT1; break; default: - return(-EINVAL); + return(EINVAL); } #define EVTQNUM 0 @@ -1456,7 +1456,7 @@ ti_mmchs_init_dma_channels(struct ti_mmc /* Get the current chip revision */ rev = ti_revision(); if ((OMAP_REV_DEVICE(rev) != OMAP4430_DEV) && (sc->device_id > 3)) - return(-EINVAL); + return(EINVAL); /* Get the DMA MMC triggers */ switch (sc->device_id) { @@ -1482,7 +1482,7 @@ ti_mmchs_init_dma_channels(struct ti_mmc sc->dma_rx_trig = 59; break; default: - return(-EINVAL); + return(EINVAL); } /* Activate a RX channel from the OMAP DMA driver */ Modified: projects/armv6/sys/arm/ti/twl/twl_vreg.c ============================================================================== --- projects/armv6/sys/arm/ti/twl/twl_vreg.c Mon Apr 16 23:17:29 2012 (r234360) +++ projects/armv6/sys/arm/ti/twl/twl_vreg.c Mon Apr 16 23:19:21 2012 (r234361) @@ -639,7 +639,7 @@ twl_vreg_read_regulator_voltage(struct t uint8_t vsel; /* Check if the regulator is currently enabled */ - if ((ret = twl_vreg_is_regulator_enabled(sc, regulator)) < 0) + if ((ret = twl_vreg_is_regulator_enabled(sc, regulator))) return (ret); if (ret == 0) { Modified: projects/armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- projects/armv6/sys/arm/ti/usb/omap_ehci.c Mon Apr 16 23:17:29 2012 (r234360) +++ projects/armv6/sys/arm/ti/usb/omap_ehci.c Mon Apr 16 23:19:21 2012 (r234361) @@ -396,7 +396,7 @@ omap_ehci_init(struct omap_ehci_softc *i if (timeout-- == 0) { device_printf(isc->sc_dev, "TLL reset operation timed out\n"); - ret = -EINVAL; + ret = EINVAL; goto err_sys_status; } }