summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2016-05-02 16:47:28 +0000
committerpfg <pfg@FreeBSD.org>2016-05-02 16:47:28 +0000
commit6ce01c2d90ee54ebc392d273c0f3e9d7af3a11b7 (patch)
tree64a5c2fa4f8dd9c88148b816b335988865edd950
parenta394bd2abd40f90a6b211a64f88b645898a99050 (diff)
downloadFreeBSD-src-6ce01c2d90ee54ebc392d273c0f3e9d7af3a11b7.zip
FreeBSD-src-6ce01c2d90ee54ebc392d273c0f3e9d7af3a11b7.tar.gz
etc: minor spelling fixes.
Mostly comments but also some user-visible strings. MFC after: 2 weeks
-rw-r--r--sys/dev/ciss/ciss.c6
-rw-r--r--sys/dev/drm2/i915/i915_gem.c4
-rw-r--r--sys/dev/drm2/i915/intel_dp.c2
-rw-r--r--sys/dev/drm2/radeon/radeon_fb.c2
-rw-r--r--sys/dev/drm2/ttm/ttm_bo_vm.c4
-rw-r--r--sys/dev/hptiop/hptiop.c2
-rw-r--r--sys/dev/hwpmc/hwpmc_mod.c14
-rw-r--r--sys/dev/isci/scil/scic_phy.h2
-rw-r--r--sys/dev/isci/scil/scic_sds_phy.c36
-rw-r--r--sys/dev/pccbb/pccbb_pci.c4
-rw-r--r--sys/dev/wbwd/wbwd.c2
-rw-r--r--sys/dev/wtap/if_wtap.c2
-rw-r--r--sys/dev/wtap/if_wtap_module.c4
-rw-r--r--sys/dev/wtap/plugins/visibility.c2
14 files changed, 43 insertions, 43 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 6c2a843..f4eeabf 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -464,7 +464,7 @@ ciss_attach(device_t dev)
ciss_initq_notify(sc);
/*
- * Initalize device sysctls.
+ * Initialize device sysctls.
*/
ciss_init_sysctl(sc);
@@ -619,7 +619,7 @@ ciss_init_pci(struct ciss_softc *sc)
/*
* XXX Big hammer, masks/unmasks all possible interrupts. This should
* work on all hardware variants. Need to add code to handle the
- * "controller crashed" interupt bit that this unmasks.
+ * "controller crashed" interrupt bit that this unmasks.
*/
sqmask = ~0;
}
@@ -4487,7 +4487,7 @@ ciss_name_ldrive_org(int org)
case CISS_LDRIVE_RAIDADG:
return("RAID ADG");
}
- return("unkown");
+ return("unknown");
}
/************************************************************************
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c
index 41ce74c..2e75623 100644
--- a/sys/dev/drm2/i915/i915_gem.c
+++ b/sys/dev/drm2/i915/i915_gem.c
@@ -1600,7 +1600,7 @@ have_page:
}
DRM_UNLOCK(dev);
if (*mres != NULL) {
- KASSERT(*mres != page, ("loosing %p %p", *mres, page));
+ KASSERT(*mres != page, ("losing %p %p", *mres, page));
vm_page_lock(*mres);
vm_page_free(*mres);
vm_page_unlock(*mres);
@@ -3149,7 +3149,7 @@ static bool i915_gem_valid_gtt_space(struct drm_device *dev,
/* On non-LLC machines we have to be careful when putting differing
* types of snoopable memory together to avoid the prefetcher
- * crossing memory domains and dieing.
+ * crossing memory domains and dying.
*/
if (HAS_LLC(dev))
return true;
diff --git a/sys/dev/drm2/i915/intel_dp.c b/sys/dev/drm2/i915/intel_dp.c
index 8bff4610..67dd543 100644
--- a/sys/dev/drm2/i915/intel_dp.c
+++ b/sys/dev/drm2/i915/intel_dp.c
@@ -1959,7 +1959,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)
}
if (channel_eq)
- DRM_DEBUG_KMS("Channel EQ done. DP Training successfull\n");
+ DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_DISABLE);
}
diff --git a/sys/dev/drm2/radeon/radeon_fb.c b/sys/dev/drm2/radeon/radeon_fb.c
index 6ed52d9..1ad00a0 100644
--- a/sys/dev/drm2/radeon/radeon_fb.c
+++ b/sys/dev/drm2/radeon/radeon_fb.c
@@ -228,7 +228,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
if (ret) {
- DRM_ERROR("failed to initalise framebuffer %d\n", ret);
+ DRM_ERROR("failed to initialise framebuffer %d\n", ret);
goto out_unref;
}
diff --git a/sys/dev/drm2/ttm/ttm_bo_vm.c b/sys/dev/drm2/ttm/ttm_bo_vm.c
index 96ebeca..438077b 100644
--- a/sys/dev/drm2/ttm/ttm_bo_vm.c
+++ b/sys/dev/drm2/ttm/ttm_bo_vm.c
@@ -260,7 +260,7 @@ reserve:
m->valid = VM_PAGE_BITS_ALL;
vm_page_xbusy(m);
if (*mres != NULL) {
- KASSERT(*mres != m, ("loosing %p %p", *mres, m));
+ KASSERT(*mres != m, ("losing %p %p", *mres, m));
vm_page_lock(*mres);
vm_page_free(*mres);
vm_page_unlock(*mres);
@@ -296,7 +296,7 @@ ttm_bo_vm_ctor(void *handle, vm_ooffset_t size, vm_prot_t prot,
* acquired either in ttm_bo_mmap() or ttm_bo_vm_open(). It's
* then released in ttm_bo_vm_close().
*
- * Here, this function is called during mmap() intialization.
+ * Here, this function is called during mmap() initialization.
* Thus, the reference acquired in ttm_bo_mmap_single() is
* sufficient.
*/
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 204e13d..b9c7211 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -2408,7 +2408,7 @@ static void hptiop_post_req_itl(struct hpt_iop_hba *hba,
iop_req32 = BUS_SPACE_RD4_ITL(inbound_queue);
if (iop_req32 == IOPMU_QUEUE_EMPTY) {
- device_printf(hba->pcidev, "invaild req offset\n");
+ device_printf(hba->pcidev, "invalid req offset\n");
ccb->ccb_h.status = CAM_BUSY;
bus_dmamap_unload(hba->io_dmat, srb->dma_map);
hptiop_free_srb(hba, srb);
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index 4a5586c..c0caab6 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -1123,7 +1123,7 @@ pmc_detach_one_process(struct proc *p, struct pmc *pm, int flags)
pmclog_process_pmcdetach(pm, p->p_pid);
/*
- * If there are no PMCs targetting this process, we remove its
+ * If there are no PMCs targeting this process, we remove its
* descriptor from the target hash table and unset the P_HWPMC
* flag in the struct proc.
*/
@@ -1232,7 +1232,7 @@ pmc_process_csw_in(struct thread *td)
p->p_pid, p->p_comm, pp);
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
- ("[pmc,%d] wierd CPU id %d", __LINE__, cpu));
+ ("[pmc,%d] weird CPU id %d", __LINE__, cpu));
pc = pmc_pcpu[cpu];
@@ -1377,7 +1377,7 @@ pmc_process_csw_out(struct thread *td)
p->p_pid, p->p_comm, pp);
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
- ("[pmc,%d wierd CPU id %d", __LINE__, cpu));
+ ("[pmc,%d weird CPU id %d", __LINE__, cpu));
pc = pmc_pcpu[cpu];
@@ -1907,7 +1907,7 @@ pmc_hook_handler(struct thread *td, int function, void *arg)
/*
* Log the exec event to all monitoring owners. Skip
- * owners who have already recieved the event because
+ * owners who have already received the event because
* they had system sampling PMCs active.
*/
for (ri = 0; ri < md->pmd_npmc; ri++)
@@ -1933,7 +1933,7 @@ pmc_hook_handler(struct thread *td, int function, void *arg)
/*
* If the newly exec()'ed process has a different credential
* than before, allow it to be the target of a PMC only if
- * the PMC's owner has sufficient priviledge.
+ * the PMC's owner has sufficient privilege.
*/
for (ri = 0; ri < md->pmd_npmc; ri++)
@@ -4441,7 +4441,7 @@ pmc_process_exit(void *arg __unused, struct proc *p)
* process, we would have context switched IN at some prior
* point. However, with PREEMPTION, kernel mode context
* switches may happen any time, so we want to disable a
- * context switch OUT till we get any PMCs targetting this
+ * context switch OUT till we get any PMCs targeting this
* process off the hardware.
*
* We also need to atomically remove this process'
@@ -4544,7 +4544,7 @@ pmc_process_exit(void *arg __unused, struct proc *p)
/*
* Unlink this process from the PMCs that are
- * targetting it. This will send a signal to
+ * targeting it. This will send a signal to
* all PMC owner's whose PMCs are orphaned.
*
* Log PMC value at exit time if requested.
diff --git a/sys/dev/isci/scil/scic_phy.h b/sys/dev/isci/scil/scic_phy.h
index 754cf5d..75b11d4 100644
--- a/sys/dev/isci/scil/scic_phy.h
+++ b/sys/dev/isci/scil/scic_phy.h
@@ -308,7 +308,7 @@ SCI_STATUS scic_sas_phy_get_properties(
/**
* @brief This method will enable the user to retrieve information
- * specific to a SATA phy, such as: the recieved signature
+ * specific to a SATA phy, such as: the received signature
* FIS, if a port selector is present, etc.
*
* @param[in] phy this parameter specifies the phy for which to
diff --git a/sys/dev/isci/scil/scic_sds_phy.c b/sys/dev/isci/scil/scic_sds_phy.c
index a893e29..a7755c3 100644
--- a/sys/dev/isci/scil/scic_sds_phy.c
+++ b/sys/dev/isci/scil/scic_sds_phy.c
@@ -749,7 +749,7 @@ SCI_STATUS scic_sds_phy_initialize(
this_phy, link_layer_registers
));
- // Perfrom the initialization of the TL hardware
+ // Perform the initialization of the TL hardware
scic_sds_phy_transport_layer_initialization(this_phy, transport_layer_registers);
// Perofrm the initialization of the PE hardware
@@ -1029,7 +1029,7 @@ SCI_STATUS scic_sds_phy_reset(
}
/**
- * @brief This method will process the event code recieved.
+ * @brief This method will process the event code received.
*
* @param[in] this_phy
* @param[in] event_code
@@ -1052,7 +1052,7 @@ SCI_STATUS scic_sds_phy_event_handler(
}
/**
- * @brief This method will process the frame index recieved.
+ * @brief This method will process the frame index received.
*
* @param[in] this_phy
* @param[in] frame_index
@@ -1754,7 +1754,7 @@ SCI_STATUS scic_sds_phy_default_frame_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY,
- "SCIC Phy 0x%08x recieved unexpected frame data %d while in state %d\n",
+ "SCIC Phy 0x%08x received unexpected frame data %d while in state %d\n",
this_phy, frame_index,
sci_base_state_machine_get_state(&this_phy->parent.state_machine)
));
@@ -1866,7 +1866,7 @@ SCI_STATUS scic_sds_phy_stopped_state_start_handler(
* This method takes the SCIC_SDS_PHY from a stopped state and destroys it.
* - This function takes no action.
*
- * @todo Shouldnt this function transition the SCI_BASE_PHY::state_machine to
+ * @todo Shouldn't this function transition the SCI_BASE_PHY::state_machine to
* the SCI_BASE_PHY_STATE_FINAL?
*
* @param[in] phy This is the SCI_BASE_PHY object which is cast into a
@@ -1964,7 +1964,7 @@ SCI_STATUS scic_sds_phy_ready_state_reset_handler(
* - decoded event is a link failure
* - transition the SCIC_SDS_PHY back to the SCI_BASE_PHY_STATE_STARTING
* state.
- * - any other event recived will report a warning message
+ * - any other event received will report a warning message
*
* @param[in] phy This is the SCIC_SDS_PHY object which has received the
* event.
@@ -2020,7 +2020,7 @@ SCI_STATUS scic_sds_phy_ready_state_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "SCIC PHY 0x%x ready state machine recieved unexpected event_code %x\n",
+ "SCIC PHY 0x%x ready state machine received unexpected event_code %x\n",
this_phy, event_code
));
result = SCI_FAILURE_INVALID_STATE;
@@ -2066,7 +2066,7 @@ SCI_STATUS scic_sds_phy_resetting_state_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "SCIC PHY 0x%x resetting state machine recieved unexpected event_code %x\n",
+ "SCIC PHY 0x%x resetting state machine received unexpected event_code %x\n",
this_phy, event_code
));
@@ -2691,7 +2691,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_ossp_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -2772,7 +2772,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sas_phy_speed_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -2834,7 +2834,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_iaf_uf_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -2879,7 +2879,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sas_power_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -2935,7 +2935,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sata_power_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -3003,7 +3003,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sata_phy_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -3090,7 +3090,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sata_speed_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -3147,7 +3147,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sig_fis_event_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_RECEIVED_EVENTS,
- "PHY starting substate machine recieved unexpected event_code %x\n",
+ "PHY starting substate machine received unexpected event_code %x\n",
event_code
));
@@ -3246,7 +3246,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_iaf_uf_frame_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_UNSOLICITED_FRAMES,
- "PHY starting substate machine recieved unexpected frame id %x\n",
+ "PHY starting substate machine received unexpected frame id %x\n",
frame_index
));
}
@@ -3332,7 +3332,7 @@ SCI_STATUS scic_sds_phy_starting_substate_await_sig_fis_frame_handler(
SCIC_LOG_WARNING((
sci_base_object_get_logger(this_phy),
SCIC_LOG_OBJECT_PHY | SCIC_LOG_OBJECT_UNSOLICITED_FRAMES,
- "PHY starting substate machine recieved unexpected frame id %x\n",
+ "PHY starting substate machine received unexpected frame id %x\n",
frame_index
));
}
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 4ec8d9b..3ccec52 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -340,7 +340,7 @@ cbb_pci_attach(device_t brdev)
SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "memory",
CTLFLAG_RD, &sc->subbus, 0, "Memory window open");
SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "premem",
- CTLFLAG_RD, &sc->subbus, 0, "Prefetch memroy window open");
+ CTLFLAG_RD, &sc->subbus, 0, "Prefetch memory window open");
SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "io1",
CTLFLAG_RD, &sc->subbus, 0, "io range 1 open");
SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "io2",
@@ -448,7 +448,7 @@ cbb_chipinit(struct cbb_softc *sc)
if (pci_read_config(sc->dev, PCIR_LATTIMER, 1) < 0x20)
pci_write_config(sc->dev, PCIR_LATTIMER, 0x20, 1);
- /* Enable DMA, memory access for this card and I/O acces for children */
+ /* Enable DMA, memory access for this card and I/O access for children */
pci_enable_busmaster(sc->dev);
pci_enable_io(sc->dev, SYS_RES_IOPORT);
pci_enable_io(sc->dev, SYS_RES_MEMORY);
diff --git a/sys/dev/wbwd/wbwd.c b/sys/dev/wbwd/wbwd.c
index 7ed2d48..47d7bbd 100644
--- a/sys/dev/wbwd/wbwd.c
+++ b/sys/dev/wbwd/wbwd.c
@@ -754,7 +754,7 @@ wb_attach(device_t dev)
sc = device_get_softc(dev);
KASSERT(sc->ext_cfg_enter_f != NULL && sc->ext_cfg_exit_f != NULL,
- ("%s: successfull probe result but not setup correctly", __func__));
+ ("%s: successful probe result but not setup correctly", __func__));
/* Watchdog is configured as part of LDN 8 (GPIO Port2, Watchdog). */
write_reg(sc, WB_LDN_REG, WB_LDN_REG_LDN8);
diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index 2c58ad9..9646129 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -131,7 +131,7 @@ wtap_node_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
switch(cmd) {
default:
- DWTAP_PRINTF("Unkown WTAP IOCTL\n");
+ DWTAP_PRINTF("Unknown WTAP IOCTL\n");
error = EINVAL;
}
return error;
diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c
index 764f8a6..c03293e 100644
--- a/sys/dev/wtap/if_wtap_module.c
+++ b/sys/dev/wtap/if_wtap_module.c
@@ -88,7 +88,7 @@
MALLOC_DEFINE(M_WTAP, "wtap", "wtap wireless simulator");
MALLOC_DEFINE(M_WTAP_PACKET, "wtap packet", "wtap wireless simulator packet");
MALLOC_DEFINE(M_WTAP_RXBUF, "wtap rxbuf",
- "wtap wireless simulator recieve buffer");
+ "wtap wireless simulator receive buffer");
MALLOC_DEFINE(M_WTAP_PLUGIN, "wtap plugin", "wtap wireless simulator plugin");
static struct wtap_hal *hal;
@@ -122,7 +122,7 @@ wtap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
error = EINVAL;
break;
default:
- DWTAP_PRINTF("Unkown WTAP IOCTL\n");
+ DWTAP_PRINTF("Unknown WTAP IOCTL\n");
error = EINVAL;
}
diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c
index 620dfd6..82ce5e8 100644
--- a/sys/dev/wtap/plugins/visibility.c
+++ b/sys/dev/wtap/plugins/visibility.c
@@ -230,7 +230,7 @@ vis_ioctl(struct cdev *sdev, u_long cmd, caddr_t data,
#endif
break;
default:
- DWTAP_PRINTF("Unkown WTAP IOCTL\n");
+ DWTAP_PRINTF("Unknown WTAP IOCTL\n");
error = EINVAL;
}
OpenPOWER on IntegriCloud