Index: head/sys/dev/extres/hwreset/hwreset.h
===================================================================
--- head/sys/dev/extres/hwreset/hwreset.h	(revision 322696)
+++ head/sys/dev/extres/hwreset/hwreset.h	(revision 322697)
@@ -1,69 +1,67 @@
 /*-
  * Copyright 2016 Michal Meloun <mmel@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef DEV_EXTRES_HWRESET_HWRESET_H
 #define DEV_EXTRES_HWRESET_HWRESET_H
 
 #include "opt_platform.h"
 #include <sys/types.h>
 #ifdef FDT
 #include <dev/ofw/ofw_bus.h>
 #endif
 
 typedef struct hwreset *hwreset_t;
 
 /*
  * Provider interface
  */
 #ifdef FDT
-int hwreset_default_ofw_map(device_t provider_dev, phandle_t xref, int ncells,
-    pcell_t *cells, intptr_t *id);
 void hwreset_register_ofw_provider(device_t provider_dev);
 void hwreset_unregister_ofw_provider(device_t provider_dev);
 #endif
 
 /*
  * Consumer interface
  */
 int hwreset_get_by_id(device_t consumer_dev, device_t provider_dev, intptr_t id,
     hwreset_t *rst);
 void hwreset_release(hwreset_t rst);
 
 int hwreset_assert(hwreset_t rst);
 int hwreset_deassert(hwreset_t rst);
 int hwreset_is_asserted(hwreset_t rst, bool *value);
 
 #ifdef FDT
 int hwreset_get_by_ofw_name(device_t consumer_dev, phandle_t node, char *name,
     hwreset_t *rst);
 int hwreset_get_by_ofw_idx(device_t consumer_dev, phandle_t node, int idx,
     hwreset_t *rst);
 #endif
 
 
 
 #endif /* DEV_EXTRES_HWRESET_HWRESET_H */
Index: head/sys/dev/pci/pci_host_generic.h
===================================================================
--- head/sys/dev/pci/pci_host_generic.h	(revision 322696)
+++ head/sys/dev/pci/pci_host_generic.h	(revision 322697)
@@ -1,77 +1,75 @@
 /*
  * Copyright (c) 2015 Ruslan Bukin <br@bsdpad.com>
  * Copyright (c) 2015 The FreeBSD Foundation
  * All rights reserved.
  *
  * This software was developed by Semihalf.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  *
  * $FreeBSD$
  *
  */
 
 #ifndef __PCI_HOST_GENERIC_H_
 #define	__PCI_HOST_GENERIC_H_
 
 #include "pci_if.h"
 
 #define	MAX_RANGES_TUPLES	16
 #define	MIN_RANGES_TUPLES	2
 
 struct pcie_range {
 	uint64_t	pci_base;
 	uint64_t	phys_base;
 	uint64_t	size;
 	uint64_t	flags;
 #define	FLAG_IO		(1 << 0)
 #define	FLAG_MEM	(1 << 1)
 };
 
 struct generic_pcie_core_softc {
 	struct pcie_range	ranges[MAX_RANGES_TUPLES];
 	int			nranges;
 	int			coherent;
 	struct rman		mem_rman;
 	struct rman		io_rman;
 	struct resource		*res;
 	struct resource		*res1;
 	int			ecam;
 	bus_space_tag_t		bst;
 	bus_space_handle_t	bsh;
 	device_t		dev;
 	bus_space_handle_t	ioh;
 	bus_dma_tag_t		dmat;
 };
 
 DECLARE_CLASS(generic_pcie_core_driver);
 
-struct resource *pci_host_generic_core_alloc_resource(device_t,
-    device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 int pci_host_generic_core_attach(device_t);
 struct resource *pci_host_generic_core_alloc_resource(device_t, device_t, int,
     int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 int pci_host_generic_core_release_resource(device_t, device_t, int, int,
     struct resource *);
 
 #endif /* __PCI_HOST_GENERIC_H_ */