From owner-svn-src-head@freebsd.org  Thu Jan 28 15:38:04 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 2C3FFA71CBB;
 Thu, 28 Jan 2016 15:38:04 +0000 (UTC) (envelope-from zbb@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 F277414D6;
 Thu, 28 Jan 2016 15:38:03 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0SFc3El018300;
 Thu, 28 Jan 2016 15:38:03 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0SFc3M6018299;
 Thu, 28 Jan 2016 15:38:03 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201601281538.u0SFc3M6018299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Thu, 28 Jan 2016 15:38:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294992 - head/sys/arm64/cavium
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 15:38:04 -0000

Author: zbb
Date: Thu Jan 28 15:38:02 2016
New Revision: 294992
URL: https://svnweb.freebsd.org/changeset/base/294992

Log:
  Correct alloc_ and release_resource methods in thunder_pcie driver
  
  - Avoid using BUS_ macros as bus_generic_ functions should be used instead.
  - Fix mistaken device_t pointers in thunder_pcie_alloc_resource.
    Should use dev->parent method and allocate resource for child device
  
  Reviewed by:   wma
  Obtained from: Semihalf
  Sponsored by:  Cavium
  Differential Revision: https://reviews.freebsd.org/D5068

Modified:
  head/sys/arm64/cavium/thunder_pcie.c

Modified: head/sys/arm64/cavium/thunder_pcie.c
==============================================================================
--- head/sys/arm64/cavium/thunder_pcie.c	Thu Jan 28 15:34:13 2016	(r294991)
+++ head/sys/arm64/cavium/thunder_pcie.c	Thu Jan 28 15:38:02 2016	(r294992)
@@ -268,7 +268,7 @@ thunder_pcie_release_resource(device_t d
 {
 
 	if (type != SYS_RES_MEMORY)
-		return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
+		return (bus_generic_release_resource(dev, child,
 		    type, rid, res));
 
 	return (rman_release_resource(res));
@@ -291,7 +291,7 @@ thunder_pcie_alloc_resource(device_t dev
 		rm = &sc->mem_rman;
 		break;
 	default:
-		return (BUS_ALLOC_RESOURCE(device_get_parent(dev), dev,
+		return (bus_generic_alloc_resource(dev, child,
 		    type, rid, start, end, count, flags));
 	};