[src/thorpej-cfargs]: src/sys/dev/marvell No need to define interface attribu...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6374799d6803
branches:  thorpej-cfargs
changeset: 960449:6374799d6803
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Mar 22 14:50:30 2021 +0000

description:
No need to define interface attributes separately from the devices
that carry them if they are specific to that device; just declare the
interface on the device directly.

diffstat:

 sys/dev/marvell/files.discovery |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r fff95a019dbf -r 6374799d6803 sys/dev/marvell/files.discovery
--- a/sys/dev/marvell/files.discovery   Mon Mar 22 14:39:14 2021 +0000
+++ b/sys/dev/marvell/files.discovery   Mon Mar 22 14:50:30 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.discovery,v 1.22 2013/09/06 00:56:12 matt Exp $
+#      $NetBSD: files.discovery,v 1.22.46.1 2021/03/22 14:50:30 thorpej Exp $
 #
 # Config file and device description for machine-independent support for
 # the Marvell (formerly Galileo Technology) Discovery system controllers.
@@ -23,8 +23,7 @@
 defparam       opt_marvell.h   GT_MPP_WATCHDOG
 defflag        opt_marvell.h   GT_DEVBUS GT_ECC GT_COMM GT_WATCHDOG
 
-define gt { [unit = -1], [offset = -1], [irq = -1] }
-device gt: gt
+device gt { [unit = -1], [offset = -1], [irq = -1] }
 file   dev/marvell/gt.c                gt
 
 # PCI Interface
@@ -38,8 +37,7 @@
 attach mvpex at gt with mvpex_gt
 
 # Fast ethernet
-define gfec { [port = -1], [irq = -1] }
-device gfec: gfec
+device gfec { [port = -1], [irq = -1] }
 attach gfec at gt
 device gfe: ether, ifnet, arp, mii
 attach gfe at gfec
@@ -50,8 +48,7 @@
 attach gtmpsc at gt
 file   dev/marvell/gtmpsc.c            gtmpsc needs-flag
 
-define obio { [offset = -1], [size = 0], [irq = -1] }
-device obio: obio
+device obio { [offset = -1], [size = 0], [irq = -1] }
 attach obio at gt
 file   dev/marvell/obio.c              obio
 
@@ -60,8 +57,7 @@
 file   dev/marvell/mvsata_mv.c         mvsata_gt | mvsata_mbus
 
 # Gigabit Ethernet Controller Interface
-define mvgbec { [port = -1], [irq = -1] }
-device mvgbec: mvgbec
+device mvgbec { [port = -1], [irq = -1] }
 attach mvgbec at gt with mvgbec_gt
 device mvgbe: ether, ifnet, arp, mii
 attach mvgbe at mvgbec