rename the 'cn30xx' drivers to just 'oct', because digits inside devices

drivers is gross. discussed with visa.

8 files changed, 38 insertions, 38 deletions

diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC
index 3c224b45d95..f428c859c65 100644
--- a/sys/arch/octeon/conf/GENERIC
+++ b/sys/arch/octeon/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.51 2019/09/24 14:38:14 visa Exp $
+#	$OpenBSD: GENERIC,v 1.52 2019/09/28 22:20:24 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -50,7 +50,7 @@ pci*		at pcibus?
 ppb*		at pci?		# PCI-PCI bridges
 pci*		at ppb?
 
-cn30xxsmi*	at fdt?		# MDIO controller
+octsmi*		at fdt?		# MDIO controller
 com*		at fdt_octeon?
 octcib*		at fdt?		# Interrupt controller
 octcit*		at fdt?		# Interrupt controller v3
@@ -60,8 +60,8 @@ octmmc*		at fdt?		# MMC host controller
 octpip*		at fdt?		# Packet input processing unit
 sdmmc*		at octmmc?	# SD/MMC bus
 
-cn30xxgmx*	at octpip?
-cnmac*		at cn30xxgmx?
+octgmx*		at octpip?
+cnmac*		at octgmx?
 
 rgephy*		at mii?
 ukphy*		at mii?
diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK
index 2ba4904c488..519d0552053 100644
--- a/sys/arch/octeon/conf/RAMDISK
+++ b/sys/arch/octeon/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.44 2019/09/24 14:38:14 visa Exp $
+#	$OpenBSD: RAMDISK,v 1.45 2019/09/28 22:20:24 deraadt Exp $
 
 machine		octeon mips64
 maxusers	4
@@ -48,7 +48,7 @@ pci*		at pcibus?
 ppb*		at pci?
 pci*		at ppb?
 
-cn30xxsmi*	at fdt?		# MDIO controller
+octsmi*		at fdt?		# MDIO controller
 com*		at fdt_octeon?
 octcib*		at fdt?		# Interrupt controller
 octcit*		at fdt?		# Interrupt controller v3
@@ -58,8 +58,8 @@ octmmc*		at fdt?		# MMC host controller
 octpip*		at fdt?		# Packet input processing unit
 sdmmc*		at octmmc?	# SD/MMC bus
 
-cn30xxgmx*	at octpip?
-cnmac*		at cn30xxgmx?
+octgmx*		at octpip?
+cnmac*		at octgmx?
 
 pciide*		at pci? flags 0x0000
 wd*		at pciide? flags 0x0000
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index 17f4d8e444b..5ddaae27082 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.octeon,v 1.54 2019/09/15 07:15:14 visa Exp $
+#	$OpenBSD: files.octeon,v 1.55 2019/09/28 22:20:24 deraadt Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -111,21 +111,21 @@ device	octrng
 attach	octrng at iobus
 file	arch/octeon/dev/octrng.c			octrng
 
-device	cn30xxsmi {}
-attach	cn30xxsmi at fdt
-file	arch/octeon/dev/cn30xxsmi.c			cn30xxsmi
+device	octsmi {}
+attach	octsmi at fdt
+file	arch/octeon/dev/cn30xxsmi.c			octsmi
 
 define	octpip {}
-device	cn30xxgmx {}
-attach	cn30xxgmx at octpip
-file	arch/octeon/dev/cn30xxgmx.c			cn30xxgmx
+device	octgmx {}
+attach	octgmx at octpip
+file	arch/octeon/dev/cn30xxgmx.c			octgmx
 
 device	cnmac: ether, ifnet, mii, ifmedia
-attach	cnmac at cn30xxgmx
+attach	cnmac at octgmx
 file	arch/octeon/dev/if_cnmac.c			cnmac
 
-attach	com at fdt_octeon with cn30xxuart
-file	arch/octeon/dev/cn30xxuart.c			cn30xxuart
+attach	com at fdt_octeon with octuart
+file	arch/octeon/dev/cn30xxuart.c			octuart
 
 device	pcibus
 attach	pcibus at iobus
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index b3792345e92..6966e08f2fb 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.42 2019/09/20 14:58:52 visa Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.43 2019/09/28 22:20:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -149,10 +149,10 @@ struct cn30xxgmx_port_ops *cn30xxgmx_port_ops[] = {
 	[GMX_SPI42_PORT] = &cn30xxgmx_port_ops_spi42
 };
 
-struct cfattach cn30xxgmx_ca = {sizeof(struct cn30xxgmx_softc),
+struct cfattach octgmx_ca = {sizeof(struct cn30xxgmx_softc),
     cn30xxgmx_match, cn30xxgmx_attach, NULL, NULL};
 
-struct cfdriver cn30xxgmx_cd = {NULL, "cn30xxgmx", DV_DULL};
+struct cfdriver octgmx_cd = {NULL, "octgmx", DV_DULL};
 
 int
 cn30xxgmx_match(struct device *parent, void *match, void *aux)
diff --git a/sys/arch/octeon/dev/cn30xxsmi.c b/sys/arch/octeon/dev/cn30xxsmi.c
index afa10958e54..c4b212a68e7 100644
--- a/sys/arch/octeon/dev/cn30xxsmi.c
+++ b/sys/arch/octeon/dev/cn30xxsmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxsmi.c,v 1.6 2017/11/20 15:13:09 visa Exp $	*/
+/*	$OpenBSD: cn30xxsmi.c,v 1.7 2019/09/28 22:20:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -44,12 +44,12 @@ void	cn30xxsmi_attach(struct device *, struct device *, void *);
 
 void	cn30xxsmi_enable(struct cn30xxsmi_softc *);
 
-const struct cfattach cn30xxsmi_ca = {
+const struct cfattach octsmi_ca = {
 	sizeof(struct cn30xxsmi_softc), cn30xxsmi_match, cn30xxsmi_attach
 };
 
-struct cfdriver cn30xxsmi_cd = {
-	NULL, "cn30xxsmi", DV_DULL
+struct cfdriver octsmi_cd = {
+	NULL, "octsmi", DV_DULL
 };
 
 static SLIST_HEAD(, cn30xxsmi_softc) smi_list =
diff --git a/sys/arch/octeon/dev/cn30xxuart.c b/sys/arch/octeon/dev/cn30xxuart.c
index a0957d6b9d6..7e258b2ec1e 100644
--- a/sys/arch/octeon/dev/cn30xxuart.c
+++ b/sys/arch/octeon/dev/cn30xxuart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxuart.c,v 1.11 2017/09/21 12:50:20 visa Exp $	*/
+/*	$OpenBSD: cn30xxuart.c,v 1.12 2019/09/28 22:20:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -54,13 +54,13 @@ int	cn30xxuart_probe(struct device *, void *, void *);
 void	cn30xxuart_attach(struct device *, struct device *, void *);
 int	cn30xxuart_intr(void *);
 
-struct cfattach cn30xxuart_ca = {
+struct cfattach octuart_ca = {
 	sizeof(struct com_softc), cn30xxuart_probe, cn30xxuart_attach
 };
 
 extern struct cfdriver com_cd;
 
-cons_decl(cn30xxuart);
+cons_decl(octuart);
 
 #define  USR_TXFIFO_NOTFULL		2
 
@@ -189,22 +189,22 @@ cn30xxuart_wait_txhr_empty(int d)
 }
 
 void
-cn30xxuartcninit(struct consdev *consdev)
+octuartcninit(struct consdev *consdev)
 {
 }
 
 void
-cn30xxuartcnprobe(struct consdev *consdev)
+octuartcnprobe(struct consdev *consdev)
 {
 }
 
 void
-cn30xxuartcnpollc(dev_t dev, int c)
+octuartcnpollc(dev_t dev, int c)
 {
 }
 
 void
-cn30xxuartcnputc(dev_t dev, int c)
+octuartcnputc(dev_t dev, int c)
 {
 	int d;
 
@@ -216,7 +216,7 @@ cn30xxuartcnputc(dev_t dev, int c)
 }
 
 int
-cn30xxuartcngetc(dev_t dev)
+octuartcngetc(dev_t dev)
 {
 	int c, d;
 
diff --git a/sys/arch/octeon/dev/octpip.c b/sys/arch/octeon/dev/octpip.c
index 92c28ece406..e078eba506a 100644
--- a/sys/arch/octeon/dev/octpip.c
+++ b/sys/arch/octeon/dev/octpip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octpip.c,v 1.1 2019/09/15 06:57:05 visa Exp $	*/
+/*	$OpenBSD: octpip.c,v 1.2 2019/09/28 22:20:25 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2019 Visa Hankala
@@ -69,7 +69,7 @@ octpip_attach(struct device *parent, struct device *self, void *aux)
 		if (ifindex >= 16)
 			continue;
 		memset(&iaa, 0, sizeof(iaa));
-		iaa.aa_name = "cn30xxgmx";
+		iaa.aa_name = "octgmx";
 		iaa.aa_bust = faa->fa_iot;
 		iaa.aa_dmat = faa->fa_dmat;
 		iaa.aa_addr = GMX0_BASE_PORT0 + GMX_BLOCK_SIZE * ifindex;
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index f67a139bdc4..b1e0f3880ab 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.117 2019/07/31 12:38:04 visa Exp $ */
+/*	$OpenBSD: machdep.c,v 1.118 2019/09/28 22:20:25 deraadt Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -138,8 +138,8 @@ void		octeon_tlb_init(void);
 static void	process_bootargs(void);
 static uint64_t	get_ncpusfound(void);
 
-cons_decl(cn30xxuart);
-struct consdev uartcons = cons_init(cn30xxuart);
+cons_decl(octuart);
+struct consdev uartcons = cons_init(octuart);
 
 u_int		ioclock_get_timecount(struct timecounter *);