From owner-svn-src-all@FreeBSD.ORG Sat May 10 20:31:05 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C915F1AA; Sat, 10 May 2014 20:31:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B68EA806; Sat, 10 May 2014 20:31:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AKV5O1026847; Sat, 10 May 2014 20:31:05 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AKV5a9026844; Sat, 10 May 2014 20:31:05 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201405102031.s4AKV5a9026844@svn.freebsd.org> From: Andrew Turner Date: Sat, 10 May 2014 20:31:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265854 - head/sys/arm/mv X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 20:31:05 -0000 Author: andrew Date: Sat May 10 20:31:05 2014 New Revision: 265854 URL: http://svnweb.freebsd.org/changeset/base/265854 Log: Rename platform_gpio_init to be platform specific, and make it static as it's only used from this file. Modified: head/sys/arm/mv/gpio.c head/sys/arm/mv/mvvar.h Modified: head/sys/arm/mv/gpio.c ============================================================================== --- head/sys/arm/mv/gpio.c Sat May 10 20:26:49 2014 (r265853) +++ head/sys/arm/mv/gpio.c Sat May 10 20:31:05 2014 (r265854) @@ -74,6 +74,7 @@ static uint32_t gpio_setup[MV_GPIO_MAX_N static int mv_gpio_probe(device_t); static int mv_gpio_attach(device_t); static int mv_gpio_intr(void *); +static int mv_gpio_init(void); static void mv_gpio_intr_handler(int pin); static uint32_t mv_gpio_reg_read(uint32_t reg); @@ -201,7 +202,7 @@ mv_gpio_attach(device_t dev) } } - return (platform_gpio_init()); + return (mv_gpio_init()); } static int @@ -604,8 +605,8 @@ mv_handle_gpios_prop(phandle_t ctrl, pce #define MAX_PINS_PER_NODE 5 #define GPIOS_PROP_CELLS 4 -int -platform_gpio_init(void) +static int +mv_gpio_init(void) { phandle_t child, parent, root, ctrl; pcell_t gpios[MAX_PINS_PER_NODE * GPIOS_PROP_CELLS]; Modified: head/sys/arm/mv/mvvar.h ============================================================================== --- head/sys/arm/mv/mvvar.h Sat May 10 20:26:49 2014 (r265853) +++ head/sys/arm/mv/mvvar.h Sat May 10 20:31:05 2014 (r265854) @@ -82,7 +82,6 @@ void mv_gpio_intr_mask(int pin); void mv_gpio_intr_unmask(int pin); void mv_gpio_out(uint32_t pin, uint8_t val, uint8_t enable); uint8_t mv_gpio_in(uint32_t pin); -int platform_gpio_init(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev);