summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/pci/auich.c4
-rw-r--r--sys/dev/pci/auixp.c8
-rw-r--r--sys/dev/pci/if_em_hw.c15
-rw-r--r--sys/dev/pci/ises.c9
-rw-r--r--sys/dev/pci/pccbb.c4
5 files changed, 25 insertions, 15 deletions
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 68a751466f3..d61660b300e 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.56 2005/08/10 15:28:35 jsg Exp $ */
+/* $OpenBSD: auich.c,v 1.57 2005/11/26 14:31:26 krw Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -802,9 +802,11 @@ auich_set_params(v, setmode, usemode, play, rec)
case 1:
play->factor = 4;
play->sw_code = alaw_to_slinear16_mts;
+ break;
case 2:
play->factor = 2;
play->sw_code = alaw_to_slinear16;
+ break;
default:
return (EINVAL);
}
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 0b8fa974cbc..1bdf3005c9b 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.2 2005/11/21 18:16:40 millert Exp $ */
+/* $OpenBSD: auixp.c,v 1.3 2005/11/26 14:31:26 krw Exp $ */
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
/*
@@ -312,11 +312,11 @@ auixp_commit_settings(void *hdl)
case 6:
value |= ATI_REG_OUT_DMA_SLOT_BIT(7) |
ATI_REG_OUT_DMA_SLOT_BIT(8);
- /* fallthru */
+ /* FALLTHRU */
case 4:
value |= ATI_REG_OUT_DMA_SLOT_BIT(6) |
ATI_REG_OUT_DMA_SLOT_BIT(9);
- /* fallthru */
+ /* FALLTHRU */
default:
value |= ATI_REG_OUT_DMA_SLOT_BIT(3) |
ATI_REG_OUT_DMA_SLOT_BIT(4);
@@ -456,9 +456,11 @@ auixp_set_params(void *hdl, int setmode, int usemode,
case 1:
play->factor = 4;
play->sw_code = alaw_to_slinear16_mts;
+ break;
case 2:
play->factor = 2;
play->sw_code = alaw_to_slinear16;
+ break;
default:
return (EINVAL);
}
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index ac54ca325b2..25feb87c019 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-/* $OpenBSD: if_em_hw.c,v 1.13 2005/11/08 01:33:19 brad Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.14 2005/11/26 14:31:26 krw Exp $ */
/* if_em_hw.c
* Shared functions for accessing and configuring the MAC
*/
@@ -158,7 +158,7 @@ em_set_phy_type(struct em_hw *hw)
hw->phy_type = em_phy_igp;
break;
}
- /* Fall Through */
+ /* FALLTHROUGH */
default:
/* Should never have loaded on this device */
hw->phy_type = em_phy_undefined;
@@ -369,7 +369,7 @@ em_set_mac_type(struct em_hw *hw)
case em_82572:
case em_82573:
hw->eeprom_semaphore_present = TRUE;
- /* fall through */
+ /* FALLTHROUGH */
case em_82541:
case em_82547:
case em_82541_rev_2:
@@ -578,7 +578,7 @@ em_reset_hw(struct em_hw *hw)
E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
E1000_WRITE_FLUSH(hw);
}
- /* fall through */
+ /* FALLTHROUGH */
case em_82571:
case em_82572:
ret_val = em_get_auto_rd_done(hw);
@@ -1292,7 +1292,8 @@ em_copper_link_igp_setup(struct em_hw *hw)
break;
case em_ms_auto:
phy_data &= ~CR_1000T_MS_ENABLE;
- default:
+ break;
+ default:
break;
}
ret_val = em_write_phy_reg(hw, PHY_1000T_CTRL, phy_data);
@@ -4900,7 +4901,7 @@ em_setup_led(struct em_hw *hw)
~IGP01E1000_GMII_SPD));
if(ret_val)
return ret_val;
- /* Fall Through */
+ /* FALLTHROUGH */
default:
if(hw->media_type == em_media_type_fiber) {
ledctl = E1000_READ_REG(hw, LEDCTL);
@@ -4949,7 +4950,7 @@ em_cleanup_led(struct em_hw *hw)
hw->phy_spd_default);
if(ret_val)
return ret_val;
- /* Fall Through */
+ /* FALLTHROUGH */
default:
/* Restore LEDCTL settings */
E1000_WRITE_REG(hw, LEDCTL, hw->ledctl_default);
diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c
index 6c9adcf1a65..64f0191d3dc 100644
--- a/sys/dev/pci/ises.c
+++ b/sys/dev/pci/ises.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ises.c,v 1.28 2005/08/09 04:10:12 mickey Exp $ */
+/* $OpenBSD: ises.c,v 1.29 2005/11/26 14:31:26 krw Exp $ */
/*
* Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se)
@@ -262,14 +262,19 @@ ises_attach(struct device *parent, struct device *self, void *aux)
case 5:
bus_dmamem_unmap(sc->sc_dmat, (caddr_t)&sc->sc_dma_data,
sizeof sc->sc_dma_data);
+ /* FALLTHROUGH */
case 4:
bus_dmamem_free(sc->sc_dmat, &seg, nsegs);
+ /* FALLTHROUGH */
case 3:
bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmamap);
+ /* FALLTHROUGH */
case 2:
pci_intr_disestablish(pc, sc->sc_ih);
+ /* FALLTHROUGH */
case 1:
bus_space_unmap(sc->sc_memt, sc->sc_memh, memsize);
+ /* FALLTHROUGH */
default: /* 0 */
break;
}
@@ -300,9 +305,9 @@ ises_initstate(void *v)
case 0:
/* Called by dostartuphooks(9). */
timeout_set(&sc->sc_timeout, ises_initstate, sc);
+ sc->sc_initstate++;
/* FALLTHROUGH */
- sc->sc_initstate++;
case 1:
/* Power up the chip (clear powerdown bit) */
stat = READ_REG(sc, ISES_BO_STAT);
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 1970f073712..7c900d842c5 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.40 2005/11/23 11:39:37 mickey Exp $ */
+/* $OpenBSD: pccbb.c,v 1.41 2005/11/26 14:31:26 krw Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -791,7 +791,7 @@ pccbb_chipinit(sc)
}
pci_conf_write(pc, tag, PCI12XX_MFUNC, reg);
}
- /* fallthrough */
+ /* FALLTHROUGH */
case CB_TI125X:
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 19:34:37 +0000