d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- There's no need to overwrite the default device method with the default

Browse Source 
one. Interestingly, these are actually the default for quite some time
  (bus_generic_driver_added(9) since r52045 and bus_generic_print_child(9)
  since r52045) but even recently added device drivers do this unnecessarily.
  Discussed with: jhb, marcel
- While at it, use DEVMETHOD_END.
  Discussed with: jhb
- Also while at it, use __FBSDID.
This commit is contained in:
Marius Strobl 2011-11-22 21:28:20 +00:00
parent 21c8beb9fd
commit 4b7ec27007
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=227843
156 changed files with 238 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/legacy.c
View File

@ -237,19 +237,17 @@ static device_method_t cpu_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, cpu_add_child),
DEVMETHOD(bus_read_ivar, cpu_read_ivar),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource),
DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t cpu_driver = {

5
sys/arm/econa/ehci_ebus.c
View File

@ -281,10 +281,7 @@ static device_method_t ehci_methods[] = {
DEVMETHOD(device_resume, ehci_ebus_resume),
DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ehci_driver = {

5
sys/arm/econa/ohci_ec.c
View File

@ -222,10 +222,7 @@ static device_method_t ohci_methods[] = {
DEVMETHOD(device_detach, ohci_ec_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ohci_driver = {

3
sys/arm/mv/mv_pci.c
View File

@ -171,7 +171,6 @@ static device_method_t mv_pcib_methods[] = {
DEVMETHOD(device_attach, mv_pcib_attach),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, mv_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, mv_pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, mv_pcib_alloc_resource),
@ -194,7 +193,7 @@ static device_method_t mv_pcib_methods[] = {
DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t mv_pcib_driver = {

3
sys/arm/xscale/i80321/i80321_pci.c
View File

@ -373,7 +373,6 @@ static device_method_t i80321_pci_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, i80321_read_ivar),
DEVMETHOD(bus_write_ivar, i80321_write_ivar),
DEVMETHOD(bus_alloc_resource, i80321_pci_alloc_resource),
@ -389,7 +388,7 @@ static device_method_t i80321_pci_methods[] = {
DEVMETHOD(pcib_write_config, i80321_pci_write_config),
DEVMETHOD(pcib_route_interrupt, machdep_pci_route_interrupt),
{0, 0}
DEVMETHOD_END
};
static driver_t i80321_pci_driver = {

3
sys/arm/xscale/i8134x/i81342_pci.c
View File

@ -516,7 +516,6 @@ static device_method_t i81342_pci_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, i81342_read_ivar),
DEVMETHOD(bus_write_ivar, i81342_write_ivar),
DEVMETHOD(bus_alloc_resource, i81342_pci_alloc_resource),
@ -532,7 +531,7 @@ static device_method_t i81342_pci_methods[] = {
DEVMETHOD(pcib_write_config, i81342_pci_write_config),
DEVMETHOD(pcib_route_interrupt, i81342_pci_route_interrupt),
{0, 0}
DEVMETHOD_END
};
static driver_t i81342_pci_driver = {

3
sys/arm/xscale/ixp425/ixp425_pci.c
View File

@ -445,7 +445,6 @@ static device_method_t ixppcib_methods[] = {
DEVMETHOD(device_attach, ixppcib_attach),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, ixppcib_read_ivar),
DEVMETHOD(bus_write_ivar, ixppcib_write_ivar),
DEVMETHOD(bus_setup_intr, ixppcib_setup_intr),
@ -462,7 +461,7 @@ static device_method_t ixppcib_methods[] = {
DEVMETHOD(pcib_write_config, ixppcib_write_config),
DEVMETHOD(pcib_route_interrupt, ixppcib_route_interrupt),
{0, 0},
DEVMETHOD_END
};
static driver_t ixppcib_driver = {

4
sys/dev/aac/aac_pci.c
View File

@ -68,9 +68,7 @@ static device_method_t aac_methods[] = {
DEVMETHOD(device_suspend, aac_suspend),
DEVMETHOD(device_resume, aac_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t aac_pci_driver = {

3
sys/dev/acpi_support/acpi_wmi.c
View File

@ -175,7 +175,6 @@ static device_method_t acpi_wmi_methods[] = {
/* bus interface */
DEVMETHOD(bus_add_child, bus_generic_add_child),
DEVMETHOD(bus_print_child, bus_generic_print_child),
/* acpi_wmi interface */
DEVMETHOD(acpi_wmi_provides_guid_string,
@ -189,7 +188,7 @@ static device_method_t acpi_wmi_methods[] = {
DEVMETHOD(acpi_wmi_get_block, acpi_wmi_get_block_method),
DEVMETHOD(acpi_wmi_set_block, acpi_wmi_set_block_method),
{0, 0}
DEVMETHOD_END
};
static driver_t acpi_wmi_driver = {

3
sys/dev/acpica/acpi_cpu.c
View File

@ -187,13 +187,12 @@ static device_method_t acpi_cpu_methods[] = {
DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource),
DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{0, 0}
DEVMETHOD_END
};
static driver_t acpi_cpu_driver = {

3
sys/dev/acpica/acpi_isab.c
View File

@ -68,7 +68,6 @@ static device_method_t acpi_isab_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_isab_read_ivar),
DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
@ -77,7 +76,7 @@ static device_method_t acpi_isab_methods[] = {
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{0, 0}
DEVMETHOD_END
};
static driver_t acpi_isab_driver = {

3
sys/dev/acpica/acpi_pcib_acpi.c
View File

@ -106,7 +106,6 @@ static device_method_t acpi_pcib_acpi_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource),
@ -133,7 +132,7 @@ static device_method_t acpi_pcib_acpi_methods[] = {
DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi),
DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep),
{0, 0}
DEVMETHOD_END
};
static devclass_t pcib_devclass;

4
sys/dev/amr/amr_pci.c
View File

@ -106,9 +106,7 @@ static device_method_t amr_methods[] = {
DEVMETHOD(device_suspend, amr_pci_suspend),
DEVMETHOD(device_resume, amr_pci_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t amr_pci_driver = {

10
sys/dev/arcmsr/arcmsr.c
View File

@ -70,8 +70,11 @@
** 1.20.00.21 03/03/2011 Ching Huang if a command timeout, then wait its ccb back before free it
** 1.20.00.22 07/04/2011 Ching Huang Fixed multiple MTX panic
******************************************************************************************
* $FreeBSD$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#if 0
#define ARCMSR_DEBUG1 1
#endif
@ -223,9 +226,8 @@ static device_method_t arcmsr_methods[]={
DEVMETHOD(device_shutdown, arcmsr_shutdown),
DEVMETHOD(device_suspend, arcmsr_suspend),
DEVMETHOD(device_resume, arcmsr_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t arcmsr_driver={

6
sys/dev/bce/if_bce.c
View File

@ -455,10 +455,6 @@ static device_method_t bce_methods[] = {
/* DEVMETHOD(device_resume, bce_resume), */
/* DEVMETHOD(device_quiesce, bce_quiesce), */
/* Bus interface (bus_if.h) */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface (miibus_if.h) */
DEVMETHOD(miibus_readreg, bce_miibus_read_reg),
DEVMETHOD(miibus_writereg, bce_miibus_write_reg),
@ -467,7 +463,7 @@ static device_method_t bce_methods[] = {
/* DEVMETHOD(miibus_linkchg, bce_miibus_linkchg), */
/* DEVMETHOD(miibus_mediainit, bce_miibus_mediainit), */
{ 0, 0 }
DEVMETHOD_END
};
static driver_t bce_driver = {

6
sys/dev/bfe/if_bfe.c
View File

@ -137,16 +137,12 @@ static device_method_t bfe_methods[] = {
DEVMETHOD(device_suspend, bfe_suspend),
DEVMETHOD(device_resume, bfe_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, bfe_miibus_readreg),
DEVMETHOD(miibus_writereg, bfe_miibus_writereg),
DEVMETHOD(miibus_statchg, bfe_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t bfe_driver = {

6
sys/dev/bge/if_bge.c
View File

@ -493,16 +493,12 @@ static device_method_t bge_methods[] = {
DEVMETHOD(device_suspend, bge_suspend),
DEVMETHOD(device_resume, bge_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, bge_miibus_readreg),
DEVMETHOD(miibus_writereg, bge_miibus_writereg),
DEVMETHOD(miibus_statchg, bge_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t bge_driver = {

7
sys/dev/bm/if_bm.c
View File

@ -135,15 +135,12 @@ static device_method_t bm_methods[] = {
DEVMETHOD(device_detach, bm_detach),
DEVMETHOD(device_shutdown, bm_shutdown),
/* bus interface, for miibus */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, bm_miibus_readreg),
DEVMETHOD(miibus_writereg, bm_miibus_writereg),
DEVMETHOD(miibus_statchg, bm_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t bm_macio_driver = {

6
sys/dev/bxe/if_bxe.c
View File

@ -400,11 +400,7 @@ static device_method_t bxe_methods[] = {
DEVMETHOD(device_detach, bxe_detach),
DEVMETHOD(device_shutdown, bxe_shutdown),
/* Bus interface (bus_if.h) */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
KOBJMETHOD_END
DEVMETHOD_END
};

6
sys/dev/cas/if_cas.c
View File

@ -2600,16 +2600,12 @@ static device_method_t cas_pci_methods[] = {
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, cas_pci_suspend),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, cas_mii_readreg),
DEVMETHOD(miibus_writereg, cas_mii_writereg),
DEVMETHOD(miibus_statchg, cas_mii_statchg),
KOBJMETHOD_END
DEVMETHOD_END
};
static driver_t cas_pci_driver = {

6
sys/dev/cesa/cesa.c
View File

@ -93,16 +93,12 @@ static device_method_t cesa_methods[] = {
DEVMETHOD(device_attach, cesa_attach),
DEVMETHOD(device_detach, cesa_detach),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* Crypto device methods */
DEVMETHOD(cryptodev_newsession, cesa_newsession),
DEVMETHOD(cryptodev_freesession,cesa_freesession),
DEVMETHOD(cryptodev_process, cesa_process),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t cesa_driver = {

6
sys/dev/cxgb/cxgb_main.c
View File

@ -129,11 +129,7 @@ static device_method_t cxgb_controller_methods[] = {
DEVMETHOD(device_attach, cxgb_controller_attach),
DEVMETHOD(device_detach, cxgb_controller_detach),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t cxgb_controller_driver = {

6
sys/dev/cxgbe/t4_main.c
View File

@ -73,11 +73,7 @@ static device_method_t t4_methods[] = {
DEVMETHOD(device_attach, t4_attach),
DEVMETHOD(device_detach, t4_detach),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t t4_driver = {
"t4nex",

6
sys/dev/dc/if_dc.c
View File

@ -337,17 +337,13 @@ static device_method_t dc_methods[] = {
DEVMETHOD(device_resume, dc_resume),
DEVMETHOD(device_shutdown, dc_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, dc_miibus_readreg),
DEVMETHOD(miibus_writereg, dc_miibus_writereg),
DEVMETHOD(miibus_statchg, dc_miibus_statchg),
DEVMETHOD(miibus_mediainit, dc_miibus_mediainit),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t dc_driver = {

3
sys/dev/eisa/eisaconf.c
View File

@ -557,7 +557,6 @@ static device_method_t eisa_methods[] = {
DEVMETHOD(bus_probe_nomatch, eisa_probe_nomatch),
DEVMETHOD(bus_read_ivar, eisa_read_ivar),
DEVMETHOD(bus_write_ivar, eisa_write_ivar),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_alloc_resource, eisa_alloc_resource),
DEVMETHOD(bus_release_resource, eisa_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -570,7 +569,7 @@ static device_method_t eisa_methods[] = {
DEVMETHOD(eisa_add_iospace, eisa_add_iospace_m),
DEVMETHOD(eisa_add_mspace, eisa_add_mspace_m),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t eisa_driver = {

5
sys/dev/et/if_et.c
View File

@ -170,14 +170,11 @@ static device_method_t et_methods[] = {
DEVMETHOD(device_detach, et_detach),
DEVMETHOD(device_shutdown, et_shutdown),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(miibus_readreg, et_miibus_readreg),
DEVMETHOD(miibus_writereg, et_miibus_writereg),
DEVMETHOD(miibus_statchg, et_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t et_driver = {

3
sys/dev/fb/fb.c
View File

@ -315,8 +315,7 @@ static device_method_t fb_methods[] = {
DEVMETHOD(device_probe, fbprobe),
DEVMETHOD(device_attach, fbattach),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t fb_driver = {

9
sys/dev/firewire/firewire.c
View File

@ -30,11 +30,11 @@
* 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$
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
@ -128,9 +128,8 @@ static device_method_t firewire_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, firewire_add_child),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
DEVMETHOD_END
};
char *linkspeed[] = {
"S100", "S200", "S400", "S800",

8
sys/dev/firewire/fwohci_pci.c
View File

@ -30,10 +30,11 @@
* 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$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define BOUNCE_BUFFER_TEST 0
#include <sys/param.h>
@ -536,9 +537,8 @@ static device_method_t fwohci_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, fwohci_pci_add_child),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t fwohci_driver = {

6
sys/dev/gem/if_gem_pci.c
View File

@ -82,16 +82,12 @@ static device_method_t gem_pci_methods[] = {
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, gem_pci_suspend),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, gem_mii_readreg),
DEVMETHOD(miibus_writereg, gem_mii_writereg),
DEVMETHOD(miibus_statchg, gem_mii_statchg),
KOBJMETHOD_END
DEVMETHOD_END
};
static driver_t gem_pci_driver = {

6
sys/dev/gem/if_gem_sbus.c
View File

@ -78,16 +78,12 @@ static device_method_t gem_sbus_methods[] = {
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, gem_sbus_suspend),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, gem_mii_readreg),
DEVMETHOD(miibus_writereg, gem_mii_writereg),
DEVMETHOD(miibus_statchg, gem_mii_statchg),
KOBJMETHOD_END
DEVMETHOD_END
};
static driver_t gem_sbus_driver = {

3
sys/dev/gpio/gpiobus.c
View File

@ -458,7 +458,6 @@ static device_method_t gpiobus_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, gpiobus_add_child),
DEVMETHOD(bus_print_child, gpiobus_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_child_pnpinfo_str, gpiobus_child_pnpinfo_str),
DEVMETHOD(bus_child_location_str, gpiobus_child_location_str),
DEVMETHOD(bus_hinted_child, gpiobus_hinted_child),
@ -475,7 +474,7 @@ static device_method_t gpiobus_methods[] = {
DEVMETHOD(gpiobus_pin_set, gpiobus_pin_set),
DEVMETHOD(gpiobus_pin_toggle, gpiobus_pin_toggle),
{ 0, 0 }
DEVMETHOD_END
};
driver_t gpiobus_driver = {

6
sys/dev/hifn/hifn7751.c
View File

@ -113,16 +113,12 @@ static device_method_t hifn_methods[] = {
DEVMETHOD(device_resume, hifn_resume),
DEVMETHOD(device_shutdown, hifn_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* crypto device methods */
DEVMETHOD(cryptodev_newsession, hifn_newsession),
DEVMETHOD(cryptodev_freesession,hifn_freesession),
DEVMETHOD(cryptodev_process, hifn_process),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t hifn_driver = {
"hifn",

6
sys/dev/hme/if_hme_pci.c
View File

@ -93,16 +93,12 @@ static device_method_t hme_pci_methods[] = {
/* Can just use the suspend method here. */
DEVMETHOD(device_shutdown, hme_pci_suspend),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, hme_mii_readreg),
DEVMETHOD(miibus_writereg, hme_mii_writereg),
DEVMETHOD(miibus_statchg, hme_mii_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t hme_pci_driver = {

6
sys/dev/hme/if_hme_sbus.c
View File

@ -95,16 +95,12 @@ static device_method_t hme_sbus_methods[] = {
/* Can just use the suspend method here. */
DEVMETHOD(device_shutdown, hme_sbus_suspend),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, hme_mii_readreg),
DEVMETHOD(miibus_writereg, hme_mii_writereg),
DEVMETHOD(miibus_statchg, hme_mii_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t hme_sbus_driver = {

6
sys/dev/ichsmb/ichsmb_pci.c
View File

@ -103,9 +103,6 @@ static device_method_t ichsmb_pci_methods[] = {
DEVMETHOD(device_attach, ichsmb_pci_attach),
DEVMETHOD(device_detach, ichsmb_detach),
/* Bus methods */
DEVMETHOD(bus_print_child, bus_generic_print_child),
/* SMBus methods */
DEVMETHOD(smbus_callback, ichsmb_callback),
DEVMETHOD(smbus_quick, ichsmb_quick),
@ -118,7 +115,8 @@ static device_method_t ichsmb_pci_methods[] = {
DEVMETHOD(smbus_pcall, ichsmb_pcall),
DEVMETHOD(smbus_bwrite, ichsmb_bwrite),
DEVMETHOD(smbus_bread, ichsmb_bread),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t ichsmb_pci_driver = {

4
sys/dev/ida/ida_pci.c
View File

@ -188,9 +188,7 @@ static device_method_t ida_pci_methods[] = {
DEVMETHOD(device_attach, ida_pci_attach),
DEVMETHOD(device_detach, ida_detach),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t ida_pci_driver = {

4
sys/dev/if_ndis/if_ndis_usb.c
View File

@ -91,11 +91,9 @@ static device_method_t ndis_methods[] = {
DEVMETHOD(device_shutdown, ndis_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t ndis_driver = {

3
sys/dev/iicbus/iicbus.c
View File

@ -245,7 +245,6 @@ static device_method_t iicbus_methods[] = {
/* bus interface */
DEVMETHOD(bus_add_child, iicbus_add_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_print_child, iicbus_print_child),
DEVMETHOD(bus_probe_nomatch, iicbus_probe_nomatch),
DEVMETHOD(bus_read_ivar, iicbus_read_ivar),
@ -256,7 +255,7 @@ static device_method_t iicbus_methods[] = {
/* iicbus interface */
DEVMETHOD(iicbus_transfer, iicbus_transfer),
{ 0, 0 }
DEVMETHOD_END
};
driver_t iicbus_driver = {

14
sys/dev/iicbus/iicsmb.c
View File

@ -22,11 +22,11 @@
* 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$
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
* I2C to SMB bridge
*
@ -106,10 +106,6 @@ static device_method_t iicsmb_methods[] = {
DEVMETHOD(device_attach, iicsmb_attach),
DEVMETHOD(device_detach, iicsmb_detach),
/* bus interface */
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_print_child, bus_generic_print_child),
/* iicbus interface */
DEVMETHOD(iicbus_intr, iicsmb_intr),
@ -125,8 +121,8 @@ static device_method_t iicsmb_methods[] = {
DEVMETHOD(smbus_pcall, iicsmb_pcall),
DEVMETHOD(smbus_bwrite, iicsmb_bwrite),
DEVMETHOD(smbus_bread, iicsmb_bread),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t iicsmb_driver = {

6
sys/dev/lge/if_lge.c
View File

@ -170,16 +170,12 @@ static device_method_t lge_methods[] = {
DEVMETHOD(device_detach, lge_detach),
DEVMETHOD(device_shutdown, lge_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, lge_miibus_readreg),
DEVMETHOD(miibus_writereg, lge_miibus_writereg),
DEVMETHOD(miibus_statchg, lge_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t lge_driver = {

3
sys/dev/mca/mca_bus.c
View File

@ -507,7 +507,6 @@ static device_method_t mca_methods[] = {
DEVMETHOD(bus_probe_nomatch, mca_probe_nomatch),
DEVMETHOD(bus_read_ivar, mca_read_ivar),
DEVMETHOD(bus_write_ivar, bus_generic_write_ivar),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
@ -520,7 +519,7 @@ static device_method_t mca_methods[] = {
DEVMETHOD(bus_activate_resource,bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t mca_driver = {

5
sys/dev/mfi/mfi_pci.c
View File

@ -93,9 +93,8 @@ static device_method_t mfi_methods[] = {
DEVMETHOD(device_detach, mfi_pci_detach),
DEVMETHOD(device_suspend, mfi_pci_suspend),
DEVMETHOD(device_resume, mfi_pci_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t mfi_pci_driver = {

3
sys/dev/mii/mii.c
View File

@ -82,7 +82,6 @@ static device_method_t miibus_methods[] = {
/* bus interface */
DEVMETHOD(bus_print_child, miibus_print_child),
DEVMETHOD(bus_read_ivar, miibus_read_ivar),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_child_pnpinfo_str, miibus_child_pnpinfo_str),
DEVMETHOD(bus_child_location_str, miibus_child_location_str),
DEVMETHOD(bus_hinted_child, miibus_hinted_child),
@ -94,7 +93,7 @@ static device_method_t miibus_methods[] = {
DEVMETHOD(miibus_linkchg, miibus_linkchg),
DEVMETHOD(miibus_mediainit, miibus_mediainit),
{ 0, 0 }
DEVMETHOD_END
};
devclass_t miibus_devclass;

4
sys/dev/mlx/mlx_pci.c
View File

@ -61,9 +61,7 @@ static device_method_t mlx_methods[] = {
DEVMETHOD(device_suspend, mlx_suspend),
DEVMETHOD(device_resume, mlx_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t mlx_pci_driver = {

5
sys/dev/mps/mps_pci.c
View File

@ -78,9 +78,8 @@ static device_method_t mps_methods[] = {
DEVMETHOD(device_detach, mps_pci_detach),
DEVMETHOD(device_suspend, mps_pci_suspend),
DEVMETHOD(device_resume, mps_pci_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t mps_pci_driver = {

12
sys/dev/msk/if_msk.c
View File

@ -334,11 +334,7 @@ static device_method_t mskc_methods[] = {
DEVMETHOD(device_resume, mskc_resume),
DEVMETHOD(device_shutdown, mskc_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ NULL, NULL }
DEVMETHOD_END
};
static driver_t mskc_driver = {
@ -356,16 +352,12 @@ static device_method_t msk_methods[] = {
DEVMETHOD(device_detach, msk_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, msk_miibus_readreg),
DEVMETHOD(miibus_writereg, msk_miibus_writereg),
DEVMETHOD(miibus_statchg, msk_miibus_statchg),
{ NULL, NULL }
DEVMETHOD_END
};
static driver_t msk_driver = {

6
sys/dev/nfe/if_nfe.c
View File

@ -165,16 +165,12 @@ static device_method_t nfe_methods[] = {
DEVMETHOD(device_resume, nfe_resume),
DEVMETHOD(device_shutdown, nfe_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, nfe_miibus_readreg),
DEVMETHOD(miibus_writereg, nfe_miibus_writereg),
DEVMETHOD(miibus_statchg, nfe_miibus_statchg),
{ NULL, NULL }
DEVMETHOD_END
};
static driver_t nfe_driver = {

6
sys/dev/nge/if_nge.c
View File

@ -223,16 +223,12 @@ static device_method_t nge_methods[] = {
DEVMETHOD(device_suspend, nge_suspend),
DEVMETHOD(device_resume, nge_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, nge_miibus_readreg),
DEVMETHOD(miibus_writereg, nge_miibus_writereg),
DEVMETHOD(miibus_statchg, nge_miibus_statchg),
{ NULL, NULL }
DEVMETHOD_END
};
static driver_t nge_driver = {

6
sys/dev/nve/if_nve.c
View File

@ -184,15 +184,11 @@ static device_method_t nve_methods[] = {
DEVMETHOD(device_detach, nve_detach),
DEVMETHOD(device_shutdown, nve_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, nve_miibus_readreg),
DEVMETHOD(miibus_writereg, nve_miibus_writereg),
{0, 0}
DEVMETHOD_END
};
static driver_t nve_driver = {

3
sys/dev/pccbb/pccbb_isa.c
View File

@ -211,7 +211,6 @@ static device_method_t cbb_methods[] = {
DEVMETHOD(device_resume, cbb_resume),
/* bus methods */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, cbb_read_ivar),
DEVMETHOD(bus_write_ivar, cbb_write_ivar),
DEVMETHOD(bus_alloc_resource, cbb_alloc_resource),
@ -232,7 +231,7 @@ static device_method_t cbb_methods[] = {
DEVMETHOD(power_enable_socket, cbb_power_enable_socket),
DEVMETHOD(power_disable_socket, cbb_power_disable_socket),
{0,0}
DEVMETHOD_END
};
static driver_t cbb_isa_driver = {

3
sys/dev/pccbb/pccbb_pci.c
View File

@ -822,7 +822,6 @@ static device_method_t cbb_methods[] = {
DEVMETHOD(device_resume, cbb_resume),
/* bus methods */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, cbb_read_ivar),
DEVMETHOD(bus_write_ivar, cbb_write_ivar),
DEVMETHOD(bus_alloc_resource, cbb_alloc_resource),
@ -849,7 +848,7 @@ static device_method_t cbb_methods[] = {
DEVMETHOD(pcib_write_config, cbb_write_config),
DEVMETHOD(pcib_route_interrupt, cbb_route_interrupt),
{0,0}
DEVMETHOD_END
};
static driver_t cbb_driver = {

3
sys/dev/pci/eisa_pci.c
View File

@ -55,7 +55,6 @@ static device_method_t eisab_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -63,7 +62,7 @@ static device_method_t eisab_methods[] = {
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t eisab_driver = {

3
sys/dev/pci/isa_pci.c
View File

@ -67,7 +67,6 @@ static device_method_t isab_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, isab_pci_alloc_resource),
DEVMETHOD(bus_release_resource, isab_pci_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -75,7 +74,7 @@ static device_method_t isab_methods[] = {
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
struct isab_pci_resource {

3
sys/dev/pci/pci_pci.c
View File

@ -67,7 +67,6 @@ static device_method_t pcib_methods[] = {
DEVMETHOD(device_resume, pcib_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, pcib_read_ivar),
DEVMETHOD(bus_write_ivar, pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, pcib_alloc_resource),
@ -95,7 +94,7 @@ static device_method_t pcib_methods[] = {
DEVMETHOD(pcib_map_msi, pcib_map_msi),
DEVMETHOD(pcib_power_for_sleep, pcib_power_for_sleep),
{ 0, 0 }
DEVMETHOD_END
};
static devclass_t pcib_devclass;

6
sys/dev/pcn/if_pcn.c
View File

@ -173,16 +173,12 @@ static device_method_t pcn_methods[] = {
DEVMETHOD(device_detach, pcn_detach),
DEVMETHOD(device_shutdown, pcn_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, pcn_miibus_readreg),
DEVMETHOD(miibus_writereg, pcn_miibus_writereg),
DEVMETHOD(miibus_statchg, pcn_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t pcn_driver = {

5
sys/dev/ppbus/lpbb.c
View File

@ -245,9 +245,6 @@ static device_method_t lpbb_methods[] = {
DEVMETHOD(device_probe, lpbb_probe),
DEVMETHOD(device_attach, lpbb_attach),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
/* iicbb interface */
DEVMETHOD(iicbb_callback, lpbb_callback),
DEVMETHOD(iicbb_setsda, lpbb_setsda),
@ -256,7 +253,7 @@ static device_method_t lpbb_methods[] = {
DEVMETHOD(iicbb_getscl, lpbb_getscl),
DEVMETHOD(iicbb_reset, lpbb_reset),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t lpbb_driver = {

4
sys/dev/puc/puc_pccard.c
View File

@ -85,8 +85,8 @@ static device_method_t puc_pccard_methods[] = {
DEVMETHOD(bus_print_child, puc_bus_print_child),
DEVMETHOD(bus_child_pnpinfo_str, puc_bus_child_pnpinfo_str),
DEVMETHOD(bus_child_location_str, puc_bus_child_location_str),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t puc_pccard_driver = {

4
sys/dev/puc/puc_pci.c
View File

@ -135,8 +135,8 @@ static device_method_t puc_pci_methods[] = {
DEVMETHOD(bus_print_child, puc_bus_print_child),
DEVMETHOD(bus_child_pnpinfo_str, puc_bus_child_pnpinfo_str),
DEVMETHOD(bus_child_location_str, puc_bus_child_location_str),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t puc_pci_driver = {

4
sys/dev/quicc/quicc_bfe_fdt.c
View File

@ -59,10 +59,8 @@ static device_method_t quicc_fdt_methods[] = {
DEVMETHOD(bus_read_ivar, quicc_bus_read_ivar),
DEVMETHOD(bus_setup_intr, quicc_bus_setup_intr),
DEVMETHOD(bus_teardown_intr, quicc_bus_teardown_intr),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t quicc_fdt_driver = {

6
sys/dev/re/if_re.c
View File

@ -313,16 +313,12 @@ static device_method_t re_methods[] = {
DEVMETHOD(device_resume, re_resume),
DEVMETHOD(device_shutdown, re_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, re_miibus_readreg),
DEVMETHOD(miibus_writereg, re_miibus_writereg),
DEVMETHOD(miibus_statchg, re_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t re_driver = {

7
sys/dev/rt/if_rt.c
View File

@ -2588,17 +2588,14 @@ static device_method_t rt_dev_methods[] =
DEVMETHOD(device_suspend, rt_suspend),
DEVMETHOD(device_resume, rt_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
#ifdef IF_RT_PHY_SUPPORT
/* MII interface */
DEVMETHOD(miibus_readreg, rt_miibus_readreg),
DEVMETHOD(miibus_writereg, rt_miibus_writereg),
DEVMETHOD(miibus_statchg, rt_miibus_statchg),
#endif
{ 0, 0 }
DEVMETHOD_END
};
static driver_t rt_driver =

6
sys/dev/safe/safe.c
View File

@ -99,16 +99,12 @@ static device_method_t safe_methods[] = {
DEVMETHOD(device_resume, safe_resume),
DEVMETHOD(device_shutdown, safe_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* crypto device methods */
DEVMETHOD(cryptodev_newsession, safe_newsession),
DEVMETHOD(cryptodev_freesession,safe_freesession),
DEVMETHOD(cryptodev_process, safe_process),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t safe_driver = {
"safe",

5
sys/dev/scc/scc_bfe_ebus.c
View File

@ -84,9 +84,8 @@ static device_method_t scc_ebus_methods[] = {
DEVMETHOD(bus_read_ivar, scc_bus_read_ivar),
DEVMETHOD(bus_setup_intr, scc_bus_setup_intr),
DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t scc_ebus_driver = {

5
sys/dev/scc/scc_bfe_macio.c
View File

@ -80,9 +80,8 @@ static device_method_t scc_macio_methods[] = {
DEVMETHOD(bus_read_ivar, scc_bus_read_ivar),
DEVMETHOD(bus_setup_intr, scc_bus_setup_intr),
DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t scc_macio_driver = {

5
sys/dev/scc/scc_bfe_quicc.c
View File

@ -88,9 +88,8 @@ static device_method_t scc_quicc_methods[] = {
DEVMETHOD(bus_read_ivar, scc_bus_read_ivar),
DEVMETHOD(bus_setup_intr, scc_bus_setup_intr),
DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t scc_quicc_driver = {

5
sys/dev/scc/scc_bfe_sbus.c
View File

@ -80,9 +80,8 @@ static device_method_t scc_sbus_methods[] = {
DEVMETHOD(bus_read_ivar, scc_bus_read_ivar),
DEVMETHOD(bus_setup_intr, scc_bus_setup_intr),
DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t scc_sbus_driver = {

6
sys/dev/sec/sec.c
View File

@ -135,16 +135,12 @@ static device_method_t sec_methods[] = {
DEVMETHOD(device_resume, sec_resume),
DEVMETHOD(device_shutdown, sec_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* Crypto methods */
DEVMETHOD(cryptodev_newsession, sec_newsession),
DEVMETHOD(cryptodev_freesession,sec_freesession),
DEVMETHOD(cryptodev_process, sec_process),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t sec_driver = {
"sec",

6
sys/dev/sf/if_sf.c
View File

@ -212,16 +212,12 @@ static device_method_t sf_methods[] = {
DEVMETHOD(device_suspend, sf_suspend),
DEVMETHOD(device_resume, sf_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, sf_miibus_readreg),
DEVMETHOD(miibus_writereg, sf_miibus_writereg),
DEVMETHOD(miibus_statchg, sf_miibus_statchg),
{ NULL, NULL }
DEVMETHOD_END
};
static driver_t sf_driver = {

6
sys/dev/sfxge/sfxge.c
View File

@ -757,11 +757,7 @@ static device_method_t sfxge_methods[] = {
DEVMETHOD(device_attach, sfxge_attach),
DEVMETHOD(device_detach, sfxge_detach),
/* Bus interface. */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static devclass_t sfxge_devclass;

6
sys/dev/sge/if_sge.c
View File

@ -158,16 +158,12 @@ static device_method_t sge_methods[] = {
DEVMETHOD(device_resume, sge_resume),
DEVMETHOD(device_shutdown, sge_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, sge_miibus_readreg),
DEVMETHOD(miibus_writereg, sge_miibus_writereg),
DEVMETHOD(miibus_statchg, sge_miibus_statchg),
KOBJMETHOD_END
DEVMETHOD_END
};
static driver_t sge_driver = {

3
sys/dev/siba/siba_pcib.c
View File

@ -403,7 +403,6 @@ static device_method_t siba_pcib_methods[] = {
DEVMETHOD(device_probe, siba_pcib_probe),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, siba_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, siba_pcib_write_ivar),
DEVMETHOD(bus_setup_intr, siba_pcib_setup_intr),
@ -419,7 +418,7 @@ static device_method_t siba_pcib_methods[] = {
DEVMETHOD(pcib_write_config, siba_pcib_write_config),
DEVMETHOD(pcib_route_interrupt, siba_pcib_route_interrupt),
KOBJMETHOD_END
DEVMETHOD_END
};
static driver_t siba_pcib_driver = {

6
sys/dev/sis/if_sis.c
View File

@ -2393,16 +2393,12 @@ static device_method_t sis_methods[] = {
DEVMETHOD(device_suspend, sis_suspend),
DEVMETHOD(device_resume, sis_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, sis_miibus_readreg),
DEVMETHOD(miibus_writereg, sis_miibus_writereg),
DEVMETHOD(miibus_statchg, sis_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t sis_driver = {

12
sys/dev/sk/if_sk.c
View File

@ -296,11 +296,7 @@ static device_method_t skc_methods[] = {
DEVMETHOD(device_resume, skc_resume),
DEVMETHOD(device_shutdown, skc_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t skc_driver = {
@ -318,16 +314,12 @@ static device_method_t sk_methods[] = {
DEVMETHOD(device_detach, sk_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, sk_miibus_readreg),
DEVMETHOD(miibus_writereg, sk_miibus_writereg),
DEVMETHOD(miibus_statchg, sk_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t sk_driver = {

5
sys/dev/smbus/smbus.c
View File

@ -55,11 +55,10 @@ static device_method_t smbus_methods[] = {
DEVMETHOD(device_attach, smbus_attach),
DEVMETHOD(device_detach, smbus_detach),
/* bus interface */
/* bus interface */
DEVMETHOD(bus_add_child, bus_generic_add_child),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{ 0, 0 }
DEVMETHOD_END
};
driver_t smbus_driver = {

3
sys/dev/sound/isa/gusc.c
View File

@ -644,7 +644,6 @@ static device_method_t gusc_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, gusc_alloc_resource),
DEVMETHOD(bus_release_resource, gusc_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -652,7 +651,7 @@ static device_method_t gusc_methods[] = {
DEVMETHOD(bus_setup_intr, gusc_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t gusc_driver = {

3
sys/dev/sound/isa/sbc.c
View File

@ -790,7 +790,6 @@ static device_method_t sbc_methods[] = {
/* Bus interface */
DEVMETHOD(bus_read_ivar, sbc_read_ivar),
DEVMETHOD(bus_write_ivar, sbc_write_ivar),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, sbc_alloc_resource),
DEVMETHOD(bus_release_resource, sbc_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -798,7 +797,7 @@ static device_method_t sbc_methods[] = {
DEVMETHOD(bus_setup_intr, sbc_setup_intr),
DEVMETHOD(bus_teardown_intr, sbc_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t sbc_driver = {

3
sys/dev/sound/pci/csa.c
View File

@ -1076,7 +1076,6 @@ static device_method_t csa_methods[] = {
DEVMETHOD(device_resume, csa_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, csa_alloc_resource),
DEVMETHOD(bus_release_resource, csa_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@ -1084,7 +1083,7 @@ static device_method_t csa_methods[] = {
DEVMETHOD(bus_setup_intr, csa_setup_intr),
DEVMETHOD(bus_teardown_intr, csa_teardown_intr),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t csa_driver = {

8
sys/dev/sound/pci/fm801.c
View File

@ -276,7 +276,7 @@ fm801_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
static kobj_method_t fm801_ac97_methods[] = {
KOBJMETHOD(ac97_read, fm801_rdcd),
KOBJMETHOD(ac97_write, fm801_wrcd),
KOBJMETHOD_END
DEVMETHOD_END
};
AC97_DECLARE(fm801_ac97);
@ -530,7 +530,7 @@ static kobj_method_t fm801ch_methods[] = {
KOBJMETHOD(channel_trigger, fm801ch_trigger),
KOBJMETHOD(channel_getptr, fm801ch_getptr),
KOBJMETHOD(channel_getcaps, fm801ch_getcaps),
KOBJMETHOD_END
DEVMETHOD_END
};
CHANNEL_DECLARE(fm801ch);
@ -749,12 +749,12 @@ static device_method_t fm801_methods[] = {
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_alloc_resource, fm801_alloc_resource),
DEVMETHOD(bus_release_resource, fm801_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
{ 0, 0}
DEVMETHOD_END
};
static driver_t fm801_driver = {

7
sys/dev/sound/usb/uaudio.c
View File

@ -31,6 +31,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
* USB audio specs: http://www.usb.org/developers/devclass_docs/audio10.pdf
* http://www.usb.org/developers/devclass_docs/frmts10.pdf
@ -522,8 +525,8 @@ static device_method_t uaudio_methods[] = {
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t uaudio_driver = {

3
sys/dev/spibus/spibus.c
View File

@ -173,7 +173,6 @@ static device_method_t spibus_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, spibus_add_child),
DEVMETHOD(bus_print_child, spibus_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_probe_nomatch, spibus_probe_nomatch),
DEVMETHOD(bus_read_ivar, spibus_read_ivar),
DEVMETHOD(bus_child_pnpinfo_str, spibus_child_pnpinfo_str),
@ -183,7 +182,7 @@ static device_method_t spibus_methods[] = {
/* spibus interface */
DEVMETHOD(spibus_transfer, spibus_transfer_impl),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t spibus_driver = {

6
sys/dev/ste/if_ste.c
View File

@ -161,16 +161,12 @@ static device_method_t ste_methods[] = {
DEVMETHOD(device_suspend, ste_suspend),
DEVMETHOD(device_resume, ste_resume),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, ste_miibus_readreg),
DEVMETHOD(miibus_writereg, ste_miibus_writereg),
DEVMETHOD(miibus_statchg, ste_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t ste_driver = {

6
sys/dev/tl/if_tl.c
View File

@ -348,16 +348,12 @@ static device_method_t tl_methods[] = {
DEVMETHOD(device_detach, tl_detach),
DEVMETHOD(device_shutdown, tl_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, tl_miibus_readreg),
DEVMETHOD(miibus_writereg, tl_miibus_writereg),
DEVMETHOD(miibus_statchg, tl_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t tl_driver = {

7
sys/dev/tsec/if_tsec_fdt.c
View File

@ -88,15 +88,12 @@ static device_method_t tsec_methods[] = {
DEVMETHOD(device_suspend, tsec_suspend),
DEVMETHOD(device_resume, tsec_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
DEVMETHOD(miibus_readreg, tsec_miibus_readreg),
DEVMETHOD(miibus_writereg, tsec_miibus_writereg),
DEVMETHOD(miibus_statchg, tsec_miibus_statchg),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t tsec_fdt_driver = {

9
sys/dev/twa/tw_osl_freebsd.c
View File

@ -25,10 +25,11 @@
* 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$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
* AMCC'S 3ware driver for 9000 series storage controllers.
*
@ -195,9 +196,7 @@ static device_method_t twa_methods[] = {
DEVMETHOD(device_detach, twa_detach),
DEVMETHOD(device_shutdown, twa_shutdown),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{0, 0}
DEVMETHOD_END
};
static driver_t twa_pci_driver = {

9
sys/dev/twe/twe_freebsd.c
View File

@ -25,10 +25,11 @@
* 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$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/*
* FreeBSD-specific code.
*/
@ -135,9 +136,7 @@ static device_method_t twe_methods[] = {
DEVMETHOD(device_suspend, twe_suspend),
DEVMETHOD(device_resume, twe_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t twe_pci_driver = {

10
sys/dev/tws/tws.c
View File

@ -30,10 +30,10 @@
* 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$
*/
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <dev/tws/tws.h>
#include <dev/tws/tws_services.h>
@ -882,9 +882,7 @@ static device_method_t tws_methods[] = {
DEVMETHOD(device_suspend, tws_suspend),
DEVMETHOD(device_resume, tws_resume),
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t tws_driver = {

6
sys/dev/ubsec/ubsec.c
View File

@ -123,17 +123,13 @@ static device_method_t ubsec_methods[] = {
DEVMETHOD(device_resume, ubsec_resume),
DEVMETHOD(device_shutdown, ubsec_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* crypto device methods */
DEVMETHOD(cryptodev_newsession, ubsec_newsession),
DEVMETHOD(cryptodev_freesession,ubsec_freesession),
DEVMETHOD(cryptodev_process, ubsec_process),
DEVMETHOD(cryptodev_kprocess, ubsec_kprocess),
{ 0, 0 }
DEVMETHOD_END
};
static driver_t ubsec_driver = {
"ubsec",

5
sys/dev/usb/controller/at91dci_atmelarm.c
View File

@ -346,10 +346,7 @@ static device_method_t at91_udp_methods[] = {
DEVMETHOD(device_detach, at91_udp_detach),
DEVMETHOD(device_shutdown, at91_udp_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t at91_udp_driver = {

5
sys/dev/usb/controller/atmegadci_atmelarm.c
View File

@ -215,10 +215,7 @@ static device_method_t atmegadci_methods[] = {
DEVMETHOD(device_detach, atmegadci_detach),
DEVMETHOD(device_shutdown, atmegadci_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t atmegadci_driver = {

5
sys/dev/usb/controller/ehci_ixp4xx.c
View File

@ -339,10 +339,7 @@ static device_method_t ehci_methods[] = {
DEVMETHOD(device_resume, ehci_ixp_resume),
DEVMETHOD(device_shutdown, ehci_ixp_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ehci_driver = {

5
sys/dev/usb/controller/ehci_mv.c
View File

@ -376,10 +376,7 @@ static device_method_t ehci_methods[] = {
DEVMETHOD(device_resume, mv_ehci_resume),
DEVMETHOD(device_shutdown, mv_ehci_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ehci_driver = {

4
sys/dev/usb/controller/ehci_pci.c
View File

@ -586,10 +586,8 @@ static driver_t ehci_driver =
DEVMETHOD(device_suspend, ehci_pci_suspend),
DEVMETHOD(device_resume, ehci_pci_resume),
DEVMETHOD(device_shutdown, ehci_pci_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
},
.size = sizeof(struct ehci_softc),
};

9
sys/dev/usb/controller/musb_otg_atmelarm.c
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@ -24,6 +23,9 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
@ -238,10 +240,7 @@ static device_method_t musbotg_methods[] = {
DEVMETHOD(device_detach, musbotg_detach),
DEVMETHOD(device_shutdown, musbotg_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t musbotg_driver = {

5
sys/dev/usb/controller/ohci_atmelarm.c
View File

@ -223,10 +223,7 @@ static device_method_t ohci_methods[] = {
DEVMETHOD(device_detach, ohci_atmelarm_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ohci_driver = {

5
sys/dev/usb/controller/ohci_pci.c
View File

@ -393,10 +393,7 @@ static driver_t ohci_driver =
DEVMETHOD(device_resume, ohci_pci_resume),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
},
.size = sizeof(struct ohci_softc),
};

5
sys/dev/usb/controller/ohci_s3c24x0.c
View File

@ -200,10 +200,7 @@ static device_method_t ohci_methods[] = {
DEVMETHOD(device_detach, ohci_s3c24x0_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t ohci_driver = {

4
sys/dev/usb/controller/uhci_pci.c
View File

@ -459,9 +459,7 @@ static driver_t uhci_driver =
DEVMETHOD(device_resume, uhci_pci_resume),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
},
.size = sizeof(struct uhci_softc),
};

5
sys/dev/usb/controller/uss820dci_atmelarm.c
View File

@ -76,10 +76,7 @@ static device_method_t uss820dci_methods[] = {
DEVMETHOD(device_resume, uss820_atmelarm_resume),
DEVMETHOD(device_shutdown, uss820_atmelarm_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t uss820dci_driver = {

4
sys/dev/usb/controller/xhci_pci.c
View File

@ -75,10 +75,8 @@ static device_method_t xhci_device_methods[] = {
DEVMETHOD(device_suspend, xhci_pci_suspend),
DEVMETHOD(device_resume, xhci_pci_resume),
DEVMETHOD(device_shutdown, xhci_pci_shutdown),
/* bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
{0, 0}
DEVMETHOD_END
};
static driver_t xhci_driver = {

Some files were not shown because too many files have changed in this diff Show More