From owner-svn-src-all@freebsd.org Thu Mar 17 08:57:42 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0275AD3885; Thu, 17 Mar 2016 08:57:42 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C21A567; Thu, 17 Mar 2016 08:57:42 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2H8vf95035443; Thu, 17 Mar 2016 08:57:41 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2H8vfQv035442; Thu, 17 Mar 2016 08:57:41 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201603170857.u2H8vfQv035442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Thu, 17 Mar 2016 08:57:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296982 - head/sys/arm/allwinner 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.21 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: Thu, 17 Mar 2016 08:57:43 -0000 Author: mmel Date: Thu Mar 17 08:57:41 2016 New Revision: 296982 URL: https://svnweb.freebsd.org/changeset/base/296982 Log: A20: Gpiobus can be attached only after full gpio driver initialization. While i'm in, remove now unused global variable. Submited by: Emmanuel Vadot Modified: head/sys/arm/allwinner/a10_gpio.c Modified: head/sys/arm/allwinner/a10_gpio.c ============================================================================== --- head/sys/arm/allwinner/a10_gpio.c Thu Mar 17 08:40:58 2016 (r296981) +++ head/sys/arm/allwinner/a10_gpio.c Thu Mar 17 08:57:41 2016 (r296982) @@ -136,8 +136,6 @@ extern const struct allwinner_padconf a3 #define A10_GPIO_GP_INT_STA 0x214 #define A10_GPIO_GP_INT_DEB 0x218 -static struct a10_gpio_softc *a10_gpio_sc; - #define A10_GPIO_WRITE(_sc, _off, _val) \ bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val) #define A10_GPIO_READ(_sc, _off) \ @@ -562,12 +560,6 @@ a10_gpio_attach(device_t dev) /* Node is not a GPIO controller. */ goto fail; - a10_gpio_sc = sc; - sc->sc_busdev = gpiobus_attach_bus(dev); - if (sc->sc_busdev == NULL) - goto fail; - - /* Use the right pin data for the current SoC */ switch (allwinner_soc_type()) { #ifdef SOC_ALLWINNER_A10 @@ -594,6 +586,10 @@ a10_gpio_attach(device_t dev) return (ENOENT); } + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) + goto fail; + /* * Register as a pinctrl device */