From owner-svn-src-all@freebsd.org  Fri Dec  9 20:26:00 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 A8B48C6FC91;
 Fri,  9 Dec 2016 20:26:00 +0000 (UTC)
 (envelope-from manu@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 77F4C1DD0;
 Fri,  9 Dec 2016 20:26:00 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9KPxuU049057;
 Fri, 9 Dec 2016 20:25:59 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9KPxxG049056;
 Fri, 9 Dec 2016 20:25:59 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201612092025.uB9KPxxG049056@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Fri, 9 Dec 2016 20:25:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r309760 - stable/11/sys/arm/allwinner
X-SVN-Group: stable-11
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Dec 2016 20:26:00 -0000

Author: manu
Date: Fri Dec  9 20:25:59 2016
New Revision: 309760
URL: https://svnweb.freebsd.org/changeset/base/309760

Log:
  MFC r302585 (jmcneill):
  
  Build fix for arm64. The phy interface uses intptr_t for the "phy"
  parameter, not int.

Modified:
  stable/11/sys/arm/allwinner/aw_usbphy.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/allwinner/aw_usbphy.c
==============================================================================
--- stable/11/sys/arm/allwinner/aw_usbphy.c	Fri Dec  9 20:21:48 2016	(r309759)
+++ stable/11/sys/arm/allwinner/aw_usbphy.c	Fri Dec  9 20:25:59 2016	(r309760)
@@ -148,7 +148,7 @@ awusbphy_vbus_detect(device_t dev, int *
 }
 
 static int
-awusbphy_phy_enable(device_t dev, int phy, bool enable)
+awusbphy_phy_enable(device_t dev, intptr_t phy, bool enable)
 {
 	struct awusbphy_softc *sc;
 	regulator_t reg;
@@ -177,8 +177,9 @@ awusbphy_phy_enable(device_t dev, int ph
 	} else
 		error = regulator_disable(reg);
 	if (error != 0) {
-		device_printf(dev, "couldn't %s regulator for phy %d\n",
-		    enable ? "enable" : "disable", phy);
+		device_printf(dev,
+		    "couldn't %s regulator for phy %jd\n",
+		    enable ? "enable" : "disable", (intmax_t)phy);
 		return (error);
 	}