diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2017-01-15 17:54:01 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2017-01-15 17:54:01 +0000 |
commit | db4fcadf52c891afffded7fc72b9d9298bc39e77 (patch) | |
tree | 0008fa14a230c4de259da7601d6669c249e16b5a /sys/dev | |
parent | 953f538e0ee4699685bef4ce255a5dd94de56a2c (diff) | |
download | src-db4fcadf52c891afffded7fc72b9d9298bc39e77.tar.gz src-db4fcadf52c891afffded7fc72b9d9298bc39e77.zip |
"Buses" is the preferred plural of "bus"
Replace archaic "busses" with modern form "buses."
Intentionally excluded:
* Old/random drivers I didn't recognize
* Old hardware in general
* Use of "busses" in code as identifiers
No functional change.
http://grammarist.com/spelling/buses-busses/
PR: 216099
Reported by: bltsrc at mail.ru
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=312234
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/bhnd/bhnd.h | 2 | ||||
-rw-r--r-- | sys/dev/fdt/simplebus.c | 2 | ||||
-rw-r--r-- | sys/dev/isp/isp.c | 2 | ||||
-rw-r--r-- | sys/dev/mmc/mmcreg.h | 2 | ||||
-rw-r--r-- | sys/dev/mpt/mpt.c | 4 | ||||
-rw-r--r-- | sys/dev/mpt/mpt.h | 2 | ||||
-rw-r--r-- | sys/dev/mpt/mpt_raid.c | 6 | ||||
-rw-r--r-- | sys/dev/pccbb/pccbb_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/hostb_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/pci/pci.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/pci_private.h | 2 | ||||
-rw-r--r-- | sys/dev/pci/pci_subr.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/usb_hub.c | 4 |
13 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/bhnd/bhnd.h b/sys/dev/bhnd/bhnd.h index 0e4e03a42fc8..2532c9d07092 100644 --- a/sys/dev/bhnd/bhnd.h +++ b/sys/dev/bhnd/bhnd.h @@ -77,7 +77,7 @@ enum bhnd_device_vars { */ enum { BHND_PROBE_ROOT = 0, /**< Nexus or host bridge */ - BHND_PROBE_BUS = 1000, /**< Busses and bridges */ + BHND_PROBE_BUS = 1000, /**< Buses and bridges */ BHND_PROBE_CPU = 2000, /**< CPU devices */ BHND_PROBE_INTERRUPT = 3000, /**< Interrupt controllers. */ BHND_PROBE_TIMER = 4000, /**< Timers and clocks. */ diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index 8d43a7057bcf..f9bea0e6d444 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -125,7 +125,7 @@ simplebus_probe(device_t dev) /* * FDT data puts a "simple-bus" compatible string on many things that - * have children but aren't really busses in our world. Without a + * have children but aren't really buses in our world. Without a * ranges property we will fail to attach, so just fail to probe too. */ if (!(ofw_bus_is_compatible(dev, "simple-bus") && diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index e6ee8ca00cf2..b13a152e1a92 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -4396,7 +4396,7 @@ isp_start(XS_T *xs) /* * Now see if we need to synchronize the ISP with respect to anything. - * We do dual duty here (cough) for synchronizing for busses other + * We do dual duty here (cough) for synchronizing for buses other * than which we got here to send a command to. */ reqp = (ispreq_t *) local; diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h index ba4ca93a178a..3f516c96fc31 100644 --- a/sys/dev/mmc/mmcreg.h +++ b/sys/dev/mmc/mmcreg.h @@ -55,7 +55,7 @@ #define DEV_MMC_MMCREG_H /* - * This file contains the register definitions for the mmc and sd busses. + * This file contains the register definitions for the mmc and sd buses. * They are taken from publicly available sources. */ diff --git a/sys/dev/mpt/mpt.c b/sys/dev/mpt/mpt.c index 6d7b12626b84..1d8054f83af8 100644 --- a/sys/dev/mpt/mpt.c +++ b/sys/dev/mpt/mpt.c @@ -1544,7 +1544,7 @@ mpt_get_portfacts(struct mpt_softc *mpt, U8 port, MSG_PORT_FACTS_REPLY *freplp) /* * Send the initialization request. This is where we specify how many - * SCSI busses and how many devices per bus we wish to emulate. + * SCSI buses and how many devices per bus we wish to emulate. * This is also the command that specifies the max size of the reply * frames from the IOC that we will be allocating. */ @@ -1559,7 +1559,7 @@ mpt_send_ioc_init(struct mpt_softc *mpt, uint32_t who) init.WhoInit = who; init.Function = MPI_FUNCTION_IOC_INIT; init.MaxDevices = 0; /* at least 256 devices per bus */ - init.MaxBuses = 16; /* at least 16 busses */ + init.MaxBuses = 16; /* at least 16 buses */ init.MsgVersion = htole16(MPI_VERSION); init.HeaderVersion = htole16(MPI_HEADER_VERSION); diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h index b611d0637c95..8505a456a3c6 100644 --- a/sys/dev/mpt/mpt.h +++ b/sys/dev/mpt/mpt.h @@ -809,7 +809,7 @@ mpt_read(struct mpt_softc *mpt, int offset) /* * Some operations (e.g. diagnostic register writes while the ARM proccessor * is disabled), must be performed using "PCI pio" operations. On non-PCI - * busses, these operations likely map to normal register accesses. + * buses, these operations likely map to normal register accesses. */ static __inline void mpt_pio_write(struct mpt_softc *mpt, size_t offset, uint32_t val) diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c index ac65e2f39d9d..17042cdf7381 100644 --- a/sys/dev/mpt/mpt_raid.c +++ b/sys/dev/mpt/mpt_raid.c @@ -782,7 +782,7 @@ mpt_raid_quiesce_disk(struct mpt_softc *mpt, struct mpt_raid_disk *mpt_disk, } #endif -/* XXX Ignores that there may be multiple busses/IOCs involved. */ +/* XXX Ignores that there may be multiple buses/IOCs involved. */ cam_status mpt_map_physdisk(struct mpt_softc *mpt, union ccb *ccb, target_id_t *tgt) { @@ -799,7 +799,7 @@ mpt_map_physdisk(struct mpt_softc *mpt, union ccb *ccb, target_id_t *tgt) return (-1); } -/* XXX Ignores that there may be multiple busses/IOCs involved. */ +/* XXX Ignores that there may be multiple buses/IOCs involved. */ int mpt_is_raid_member(struct mpt_softc *mpt, target_id_t tgt) { @@ -818,7 +818,7 @@ mpt_is_raid_member(struct mpt_softc *mpt, target_id_t tgt) } -/* XXX Ignores that there may be multiple busses/IOCs involved. */ +/* XXX Ignores that there may be multiple buses/IOCs involved. */ int mpt_is_raid_volume(struct mpt_softc *mpt, target_id_t tgt) { diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index 7bf653a48b91..bc08c1903175 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -351,7 +351,7 @@ cbb_pci_attach(device_t brdev) /* * This is a gross hack. We should be scanning the entire pci * tree, assigning bus numbers in a way such that we (1) can - * reserve 1 extra bus just in case and (2) all sub busses + * reserve 1 extra bus just in case and (2) all sub buses * are in an appropriate range. */ DEVPRINTF((brdev, "Secondary bus is %d\n", sc->bus.sec)); diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c index 79664c62ac94..57b8a1ab8eaf 100644 --- a/sys/dev/pci/hostb_pci.c +++ b/sys/dev/pci/hostb_pci.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); /* * Provide a device to "eat" the host->pci bridge devices that show up - * on PCI busses and stop them showing up twice on the probes. This also + * on PCI buses and stop them showing up twice on the probes. This also * stops them showing up as 'none' in pciconf -l. If the host bridge * provides an AGP capability then we create a child agp device for the * agp GART driver to attach to. diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 7087adb42bba..3ea030c29d80 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3095,7 +3095,7 @@ pci_add_map(device_t bus, device_t dev, int reg, struct resource_list *rl, * If base is 0, then we have problems if this architecture does * not allow that. It is best to ignore such entries for the * moment. These will be allocated later if the driver specifically - * requests them. However, some removable busses look better when + * requests them. However, some removable buses look better when * all resources are allocated, so allow '0' to be overriden. * * Similarly treat maps whose values is the same as the test value @@ -4178,7 +4178,7 @@ pci_attach(device_t dev) /* * Since there can be multiple independently numbered PCI - * busses on systems with multiple PCI domains, we can't use + * buses on systems with multiple PCI domains, we can't use * the unit number to decide which bus we are probing. We ask * the parent pcib what our domain and bus numbers are. */ diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h index b0f1481810c7..6c5a1677891e 100644 --- a/sys/dev/pci/pci_private.h +++ b/sys/dev/pci/pci_private.h @@ -34,7 +34,7 @@ /* * Export definitions of the pci bus so that we can more easily share - * it with "subclass" busses. + * it with "subclass" buses. */ DECLARE_CLASS(pci_driver); diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c index f2811176c59f..822911a122c1 100644 --- a/sys/dev/pci/pci_subr.c +++ b/sys/dev/pci/pci_subr.c @@ -73,7 +73,7 @@ host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, * For the 450nx chipset, there is a whole bundle of * things pretending to be host bridges. The MIOC will * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to + * actual buses are attached to the PXB's). We need to * read the registers of the MIOC to figure out the * bus numbers for the PXB channels. * diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c index f081432efd80..3f5f5e1cba0f 100644 --- a/sys/dev/usb/usb_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -2297,7 +2297,7 @@ usb_needs_explore(struct usb_bus *bus, uint8_t do_probe) * usb_needs_explore_all * * This function is called whenever a new driver is loaded and will - * cause that all USB busses are re-explored. + * cause that all USB buses are re-explored. *------------------------------------------------------------------------*/ void usb_needs_explore_all(void) @@ -2315,7 +2315,7 @@ usb_needs_explore_all(void) return; } /* - * Explore all USB busses in parallel. + * Explore all USB buses in parallel. */ max = devclass_get_maxunit(dc); while (max >= 0) { |