From owner-svn-src-user@FreeBSD.ORG Sat Sep 11 01:26:41 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07B8C106566C; Sat, 11 Sep 2010 01:26:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EBE708FC0A; Sat, 11 Sep 2010 01:26:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8B1Qej3011068; Sat, 11 Sep 2010 01:26:40 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8B1QeeX011066; Sat, 11 Sep 2010 01:26:40 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009110126.o8B1QeeX011066@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 11 Sep 2010 01:26:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212448 - user/weongyo/usb/sys/dev/usb/controller X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Sep 2010 01:26:41 -0000 Author: weongyo Date: Sat Sep 11 01:26:40 2010 New Revision: 212448 URL: http://svn.freebsd.org/changeset/base/212448 Log: style(9) Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sat Sep 11 01:23:24 2010 (r212447) +++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sat Sep 11 01:26:40 2010 (r212448) @@ -487,9 +487,8 @@ usb_bus_mem_flush_all_cb(struct usb_bus void usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_callback_t *func) { - if (func != NULL) { + if (func != NULL) (*func)(bus, usb_bus_mem_flush_all_cb); - } } #endif @@ -504,9 +503,8 @@ usb_bus_mem_alloc_all_cb(struct usb_bus /* need to initialize the page cache */ pc->tag_parent = bus->dma_parent_tag; - if (usb_pc_alloc_mem(pc, pg, size, align)) { + if (usb_pc_alloc_mem(pc, pg, size, align)) bus->alloc_failed = 1; - } } #endif @@ -526,8 +524,7 @@ usb_bus_mem_alloc_all(struct usb_bus *bu mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), NULL, MTX_DEF | MTX_RECURSE); - usb_callout_init_mtx(&bus->power_wdog, - &bus->bus_mtx, 0); + usb_callout_init_mtx(&bus->power_wdog, &bus->bus_mtx, 0); TAILQ_INIT(&bus->intr_q.head); @@ -543,13 +540,11 @@ usb_bus_mem_alloc_all(struct usb_bus *bu bus->alloc_failed = 1; /* failure */ } #if USB_HAVE_BUSDMA - if (func != NULL) { + if (func != NULL) (*func)(bus, usb_bus_mem_alloc_all_cb); - } #endif - if (bus->alloc_failed) { + if (bus->alloc_failed) usb_bus_mem_free_all(bus, func); - } return (bus->alloc_failed); } @@ -572,9 +567,8 @@ void usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_callback_t *func) { #if USB_HAVE_BUSDMA - if (func != NULL) { + if (func != NULL) (*func)(bus, usb_bus_mem_free_all_cb); - } usb_dma_tag_unsetup(bus->dma_parent_tag); #endif