From: Alexander Bluhm <bluhm@openbsd.org>
Subject: Re: fix some kernel indentation warnings
To: tech@openbsd.org
Date: Fri, 12 Apr 2024 16:26:41 +0200

On Fri, Apr 12, 2024 at 08:40:56PM +1000, Jonathan Gray wrote:
> Reduce the amount of indentation warnings seen with smatch in the
> kernel.  No functional change, but makes it easier to find actual
> problems.

OK bluhm@

> diff --git sys/arch/hppa/dev/astro.c sys/arch/hppa/dev/astro.c
> index e3460807294..00d35c5a907 100644
> --- sys/arch/hppa/dev/astro.c
> +++ sys/arch/hppa/dev/astro.c
> @@ -407,8 +407,8 @@ iommu_iomap_load_map(struct astro_softc *sc, bus_dmamap_t map, int flags)
>  		     pa < paend; pa += PAGE_SIZE, va += PAGE_SIZE) {
>  			err = iommu_iomap_insert_page(ims, va, pa);
>  			if (err) {
> -                               printf("iomap insert error: %d for "
> -                                    "va 0x%lx pa 0x%lx\n", err, va, pa);
> +				printf("iomap insert error: %d for "
> +				    "va 0x%lx pa 0x%lx\n", err, va, pa);
>  				bus_dmamap_unload(sc->sc_dmat, map);
>  				iommu_iomap_clear_pages(ims);
>  			}
> diff --git sys/arch/macppc/macppc/ofw_machdep.c sys/arch/macppc/macppc/ofw_machdep.c
> index 7e7dec7ede6..291c5481be6 100644
> --- sys/arch/macppc/macppc/ofw_machdep.c
> +++ sys/arch/macppc/macppc/ofw_machdep.c
> @@ -388,7 +388,7 @@ ofw_find_keyboard(void)
>  		 * use the builtin ADB one for console, the USB one is
>  		 * certainly a HID device.
>  		 */
> -		 if (strncmp(iname, "PowerBook", 9) == 0)
> +		if (strncmp(iname, "PowerBook", 9) == 0)
>  			ofw_have_kbd = OFW_HAVE_ADBKBD;
>  		else
>  			ofw_have_kbd = OFW_HAVE_USBKBD;
> diff --git sys/arch/sparc64/dev/pcons.c sys/arch/sparc64/dev/pcons.c
> index f212a3058d7..9832418609b 100644
> --- sys/arch/sparc64/dev/pcons.c
> +++ sys/arch/sparc64/dev/pcons.c
> @@ -183,8 +183,8 @@ pconsattach(struct device *parent, struct device *self, void *aux)
>  	else {
>  		if (OF_getprop(OF_instance_to_package(stdin), "compatible",
>  		    buffer, sizeof(buffer)) != -1 &&
> -		   strncmp("usb", buffer, 3) == 0)
> -		sc->sc_wsdisplay = 1;
> +		    strncmp("usb", buffer, 3) == 0)
> +			sc->sc_wsdisplay = 1;
>  	}
>  
>  	if (sc->sc_wsdisplay != 0) {
> diff --git sys/arch/sparc64/sparc64/pmap.c sys/arch/sparc64/sparc64/pmap.c
> index b2dbea68520..06b50e973c6 100644
> --- sys/arch/sparc64/sparc64/pmap.c
> +++ sys/arch/sparc64/sparc64/pmap.c
> @@ -510,9 +510,9 @@ pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int maxctx, u_int numcpus
>  
>  			/* And the rest of the virtual page. */
>  			if (prom_claim_virt(newkv, szdiff) != newkv)
> -			prom_printf("pmap_bootstrap: could not claim "
> -				"virtual dseg extension "
> -				"at size %lx\r\n", newkv, szdiff);
> +				prom_printf("pmap_bootstrap: could not claim "
> +				    "virtual dseg extension "
> +				    "at size %lx\r\n", newkv, szdiff);
>  
>  			/* Make sure all 4MB are mapped */
>  			prom_map_phys(newkp, szdiff, newkv, -1);
> diff --git sys/dev/acpi/acpitoshiba.c sys/dev/acpi/acpitoshiba.c
> index c8ca3f139b4..ffb451864f3 100644
> --- sys/dev/acpi/acpitoshiba.c
> +++ sys/dev/acpi/acpitoshiba.c
> @@ -202,19 +202,18 @@ toshiba_update_brightness(void *arg0, int arg1)
>  int
>  toshiba_match(struct device *parent, void *match, void *aux)
>  {
> -      struct acpi_attach_args *aa = aux;
> -      struct cfdata	      *cf = match;
> +	struct acpi_attach_args *aa = aux;
> +	struct cfdata	      *cf = match;
>  
> -        if (acpi_matchhids(aa, acpitoshiba_hids, cf->cf_driver->cd_name))
> -                return (1);
> +	if (acpi_matchhids(aa, acpitoshiba_hids, cf->cf_driver->cd_name))
> +		return (1);
>  
>  	if (aa->aaa_name == NULL ||
> -	   strcmp(aa->aaa_name, cf->cf_driver->cd_name) != 0 ||
> -	   aa->aaa_table != NULL)
> -	      return (0);
> -
> -      return (1);
> +	    strcmp(aa->aaa_name, cf->cf_driver->cd_name) != 0 ||
> +	    aa->aaa_table != NULL)
> +		return (0);
>  
> +	return (1);
>  }
>  
>  int
> diff --git sys/dev/acpi/acpivout.c sys/dev/acpi/acpivout.c
> index db383b4500a..7a9d047ce02 100644
> --- sys/dev/acpi/acpivout.c
> +++ sys/dev/acpi/acpivout.c
> @@ -259,7 +259,7 @@ acpivout_get_bcl(struct acpivout_softc *sc)
>  		value = aml_val2int(res.v_package[i + 2]);
>  		for (j = i; j > 0 && sc->sc_bcl[j - 1] > value; j--)
>  			sc->sc_bcl[j] = sc->sc_bcl[j - 1];
> -		 sc->sc_bcl[j] = value;
> +		sc->sc_bcl[j] = value;
>  	}
>  
>  err:
> diff --git sys/dev/acpi/dsdt.c sys/dev/acpi/dsdt.c
> index 24ebf445551..fc3a57294a3 100644
> --- sys/dev/acpi/dsdt.c
> +++ sys/dev/acpi/dsdt.c
> @@ -4249,7 +4249,7 @@ aml_parse(struct aml_scope *scope, int ret_type, const char *stype)
>  		/* Name: Nt */
>  		rv = opargs[0];
>  		aml_freevalue(rv);
> -			aml_copyvalue(rv, opargs[1]);
> +		aml_copyvalue(rv, opargs[1]);
>  		break;
>  	case AMLOP_ALIAS:
>  		/* Alias: nN */
> diff --git sys/dev/ic/adw.c sys/dev/ic/adw.c
> index 5b7663970e7..5ea4da8620f 100644
> --- sys/dev/ic/adw.c
> +++ sys/dev/ic/adw.c
> @@ -449,7 +449,7 @@ adw_attach(ADW_SOFTC *sc)
>  	/*
>  	 * Zero's the freeze_device status
>  	 */
> -	 bzero(sc->sc_freeze_dev, sizeof(sc->sc_freeze_dev));
> +	bzero(sc->sc_freeze_dev, sizeof(sc->sc_freeze_dev));
>  
>  	/*
>  	 * Initialize the adapter
> diff --git sys/dev/ic/adwlib.c sys/dev/ic/adwlib.c
> index 3fe5eb3b075..ff3964ee012 100644
> --- sys/dev/ic/adwlib.c
> +++ sys/dev/ic/adwlib.c
> @@ -315,9 +315,9 @@ AdwInitFromEEPROM(ADW_SOFTC *sc)
>  					 */
>  					lsw_msb |= (ADW_EEPROM_INTAB >> 8)
>  							 & 0xFF;
> -				 }
> -				 eep_config.cfg_lsw &= 0x00FF;
> -				 eep_config.cfg_lsw |= lsw_msb << 8;
> +				}
> +				eep_config.cfg_lsw &= 0x00FF;
> +				eep_config.cfg_lsw |= lsw_msb << 8;
>  			}
>  			break;
>  		}
> diff --git sys/dev/ic/an.c sys/dev/ic/an.c
> index a834c72b6ab..213c59d755e 100644
> --- sys/dev/ic/an.c
> +++ sys/dev/ic/an.c
> @@ -905,7 +905,7 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
>  		if ((error = suser(curproc)) != 0)
>  			break;
>  		error = an_set_nwkey(sc, (struct ieee80211_nwkey *)data);
> -			break;
> +		break;
>  	case SIOCG80211NWKEY:
>  		error = an_get_nwkey(sc, (struct ieee80211_nwkey *)data);
>  		break;
> diff --git sys/dev/ic/bwi.c sys/dev/ic/bwi.c
> index b97f31e0204..0dac05d6219 100644
> --- sys/dev/ic/bwi.c
> +++ sys/dev/ic/bwi.c
> @@ -6400,7 +6400,7 @@ bwi_led_attach(struct bwi_softc *sc)
>  		if (led->l_act == BWI_LED_ACT_BLINK_SLOW ||
>  		    led->l_act == BWI_LED_ACT_BLINK_POLL ||
>  		    led->l_act == BWI_LED_ACT_BLINK) {
> -		    led->l_flags |= BWI_LED_F_BLINK;
> +		    	led->l_flags |= BWI_LED_F_BLINK;
>  			if (led->l_act == BWI_LED_ACT_BLINK_POLL)
>  				led->l_flags |= BWI_LED_F_POLLABLE;
>  			else if (led->l_act == BWI_LED_ACT_BLINK_SLOW)
> diff --git sys/dev/ic/ncr53c9x.c sys/dev/ic/ncr53c9x.c
> index 59971227a84..d19c18eefad 100644
> --- sys/dev/ic/ncr53c9x.c
> +++ sys/dev/ic/ncr53c9x.c
> @@ -2456,7 +2456,7 @@ printf("<<RESELECT CONT'd>>");
>  		if (sc->sc_state == NCR_IDLE) {
>  			printf("%s: stray interrupt\n",
>  			    sc->sc_dev.dv_xname);
> -				return (0);
> +			return (0);
>  		}
>  		break;
>  
> diff --git sys/dev/ic/siop.c sys/dev/ic/siop.c
> index 7b45e654d2a..d243f91786c 100644
> --- sys/dev/ic/siop.c
> +++ sys/dev/ic/siop.c
> @@ -579,7 +579,7 @@ siop_intr(void *v)
>  			 * unexpected disconnect. Usually the target signals
>  			 * a fatal condition this way. Attempt to get sense.
>  			 */
> -			 if (siop_cmd) {
> +			if (siop_cmd) {
>  				siop_cmd->cmd_tables->status =
>  				    siop_htoc32(&sc->sc_c, SCSI_CHECK);
>  				goto end;
> diff --git sys/dev/ic/siop_common.c sys/dev/ic/siop_common.c
> index de83744562f..66755bea0a9 100644
> --- sys/dev/ic/siop_common.c
> +++ sys/dev/ic/siop_common.c
> @@ -281,7 +281,7 @@ siop_setuptables(struct siop_common_cmd *siop_cmd)
>  		if ((*targ_flags & TARF_DT) &&
>  		    (sc->mode == STEST4_MODE_LVD)) {
>  			sc->targets[target]->status = TARST_PPR_NEG;
> -			 siop_ppr_msg(siop_cmd, msgoffset, sc->dt_minsync,
> +			siop_ppr_msg(siop_cmd, msgoffset, sc->dt_minsync,
>  			    sc->maxoff);
>  		} else if (*targ_flags & TARF_WIDE) {
>  			sc->targets[target]->status = TARST_WIDE_NEG;
> diff --git sys/dev/isa/ad1848.c sys/dev/isa/ad1848.c
> index c322a388226..25031f9274c 100644
> --- sys/dev/isa/ad1848.c
> +++ sys/dev/isa/ad1848.c
> @@ -1244,19 +1244,20 @@ ad1848_set_speed(struct ad1848_softc *sc, u_long *argp)
>  	if (arg > speed_table[n - 1].speed)
>  		selected = n - 1;
>  
> -	for (i = 1 /*really*/ ; selected == -1 && i < n; i++)
> +	for (i = 1 /*really*/ ; selected == -1 && i < n; i++) {
>  		if (speed_table[i].speed == arg)
>  			selected = i;
>  		else if (speed_table[i].speed > arg) {
>  			int diff1, diff2;
>  
> -		diff1 = arg - speed_table[i - 1].speed;
> -		diff2 = speed_table[i].speed - arg;
> +			diff1 = arg - speed_table[i - 1].speed;
> +			diff2 = speed_table[i].speed - arg;
>  
> -		if (diff1 < diff2)
> -			selected = i - 1;
> -		else
> -			selected = i;
> +			if (diff1 < diff2)
> +				selected = i - 1;
> +			else
> +				selected = i;
> +		}
>  	}
>  
>  	if (selected == -1) {
> diff --git sys/dev/mii/brgphy.c sys/dev/mii/brgphy.c
> index fbf7be2d5f3..615906363ba 100644
> --- sys/dev/mii/brgphy.c
> +++ sys/dev/mii/brgphy.c
> @@ -836,7 +836,7 @@ brgphy_reset_bge(struct mii_softc *sc)
>  	if (bge_sc->bge_phy_flags & BGE_PHY_BER_BUG)
>  		brgphy_ber_bug(sc);
>  	else if (bge_sc->bge_phy_flags & BGE_PHY_JITTER_BUG) {
> -	    PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
> +	    	PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
>  		PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG, 0x000a);
>  
>  		if (bge_sc->bge_phy_flags & BGE_PHY_ADJUST_TRIM) {
> @@ -925,7 +925,7 @@ brgphy_reset_bnx(struct mii_softc *sc)
>  			PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL3,
>  			    bnx_sc->bnx_port_hw_cfg &
>  			    BNX_PORT_HW_CFG_CFG_TXCTL3_MASK);
> -			    PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
> +			PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR,
>  			    BRGPHY_5708S_DIG_PG0);
>  		}
>  	} else if (BNX_CHIP_NUM(bnx_sc) == BNX_CHIP_NUM_5709 &&
> diff --git sys/dev/pci/arc.c sys/dev/pci/arc.c
> index 726b2e995bb..5f34dd6091c 100644
> --- sys/dev/pci/arc.c
> +++ sys/dev/pci/arc.c
> @@ -1409,18 +1409,18 @@ arc_enable_all_intr(struct arc_softc *sc)
>  		int_mask &= ~(ARC_RA_INTRMASK_POSTQUEUE |
>  			ARC_RA_INTRMASK_DOORBELL | ARC_RA_INTRMASK_MSG0);
>  		arc_write(sc, ARC_RA_INTRMASK, int_mask);
> -	    break;
> +		break;
>  	case ARC_HBA_TYPE_C:
>  		int_mask = arc_read(sc, ARC_RC_INTR_MASK);
>  		int_mask &= ~(ARC_RC_INTR_MASK_POSTQUEUE |
>  			ARC_RC_INTR_MASK_DOORBELL | ARC_RC_INTR_MASK_UTILITY_A);
>  		arc_write(sc, ARC_RC_INTR_MASK, int_mask);
> -	    break;
> +		break;
>  	case ARC_HBA_TYPE_D:
>  		int_mask = arc_read(sc, ARC_RD_INTR_ENABLE);
>  		int_mask |= ARC_RD_INTR_ENABLE_ALL;
>  		arc_write(sc, ARC_RD_INTR_ENABLE, int_mask);
> -	    break;
> +		break;
>  	}
>  }
>  
> diff --git sys/dev/pci/auvia.c sys/dev/pci/auvia.c
> index 40c8776f571..2cab4443096 100644
> --- sys/dev/pci/auvia.c
> +++ sys/dev/pci/auvia.c
> @@ -611,7 +611,7 @@ auvia_set_params(void *addr, int setmode, int usemode,
>  				if (p->channels == 6
>  				    && codec->vtbl->set_rate(codec, reg,
>  				    &p->sample_rate))
> - 				return (EINVAL);
> + 					return (EINVAL);
>  			}
>   		}
>  
> diff --git sys/dev/pci/if_em_hw.c sys/dev/pci/if_em_hw.c
> index 481ea9513b7..14ff764a374 100644
> --- sys/dev/pci/if_em_hw.c
> +++ sys/dev/pci/if_em_hw.c
> @@ -6432,9 +6432,9 @@ em_init_eeprom_params(struct em_hw *hw)
>  	case em_pch2lan:
>  	case em_pch_lpt:
>  		{
> -		int32_t         i = 0;
> -		uint32_t        flash_size = 
> -		    E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG);
> +			int32_t		i = 0;
> +			uint32_t	flash_size = 
> +			    E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG);
>  			eeprom->type = em_eeprom_ich8;
>  			eeprom->use_eerd = FALSE;
>  			eeprom->use_eewr = FALSE;
> diff --git sys/dev/pci/if_iwm.c sys/dev/pci/if_iwm.c
> index ce04cea5bb9..72334ad678c 100644
> --- sys/dev/pci/if_iwm.c
> +++ sys/dev/pci/if_iwm.c
> @@ -8169,7 +8169,7 @@ iwm_rval2ridx(int rval)
>  			break;
>  	}
>  
> -       return ridx;
> +	return ridx;
>  }
>  
>  void
> diff --git sys/dev/pci/if_iwx.c sys/dev/pci/if_iwx.c
> index a2ed6b9e626..fa6effa87d3 100644
> --- sys/dev/pci/if_iwx.c
> +++ sys/dev/pci/if_iwx.c
> @@ -786,7 +786,7 @@ iwx_alloc_fw_monitor(struct iwx_softc *sc, uint8_t max_power)
>  	}
>  
>  	if (max_power > 26) {
> -		 DPRINTF(("%s: External buffer size for monitor is too big %d, "
> +		DPRINTF(("%s: External buffer size for monitor is too big %d, "
>  		     "check the FW TLV\n", DEVNAME(sc), max_power));
>  		return 0;
>  	}
> @@ -7211,7 +7211,7 @@ iwx_rval2ridx(int rval)
>  			break;
>  	}
>  
> -       return ridx;
> +	return ridx;
>  }
>  
>  void
> @@ -9831,7 +9831,7 @@ iwx_rx_pkt(struct iwx_softc *sc, struct iwx_rx_data *data, struct mbuf_list *ml)
>  			 * For v5 and above, we can check the version, for older
>  			 * versions we need to check the size.
>  			 */
> -			 if (iwx_lookup_notif_ver(sc, IWX_LEGACY_GROUP,
> +			if (iwx_lookup_notif_ver(sc, IWX_LEGACY_GROUP,
>  			    IWX_ALIVE) == 6) {
>  				SYNC_RESP_STRUCT(resp6, pkt);
>  				if (iwx_rx_packet_payload_len(pkt) !=
> @@ -10880,7 +10880,7 @@ iwx_find_device_cfg(struct iwx_softc *sc)
>  	cores = IWX_SUBDEVICE_CORES(sdev_id);
>  
>  	for (i = nitems(iwx_dev_info_table) - 1; i >= 0; i--) {
> -		 const struct iwx_dev_info *dev_info = &iwx_dev_info_table[i];
> +		const struct iwx_dev_info *dev_info = &iwx_dev_info_table[i];
>  
>  		if (dev_info->device != (uint16_t)IWX_CFG_ANY &&
>  		    dev_info->device != sc->sc_pid)
> diff --git sys/dev/pci/if_ngbe.c sys/dev/pci/if_ngbe.c
> index 1cec2c33f3d..a0dfe2da453 100644
> --- sys/dev/pci/if_ngbe.c
> +++ sys/dev/pci/if_ngbe.c
> @@ -2954,7 +2954,7 @@ ngbe_host_interface_command(struct ngbe_softc *sc, uint32_t *buffer,
>  
>  	if (length == 0 || length > NGBE_HI_MAX_BLOCK_BYTE_LENGTH) {
>  		printf("%s: buffer length failure\n", DEVNAME(sc));
> -			return EINVAL;
> +		return EINVAL;
>  	}
>  
>  	if (hw->mac.ops.acquire_swfw_sync(sc, NGBE_MNG_SWFW_SYNC_SW_MB))
> @@ -3708,7 +3708,7 @@ ngbe_reset_hw(struct ngbe_softc *sc)
>  	 * mng is using it.  If link is down or the flag to force full link
>  	 * reset is set, then perform link reset.
>  	 */
> -	 if (hw->force_full_reset) {
> +	if (hw->force_full_reset) {
>  	 	rst_delay = (NGBE_READ_REG(hw, NGBE_MIS_RST_ST) &
>  		    NGBE_MIS_RST_ST_RST_INIT) >> NGBE_MIS_RST_ST_RST_INI_SHIFT;
>  		if (hw->reset_type == NGBE_SW_RESET) {
> @@ -4530,9 +4530,9 @@ ngbe_update_mc_addr_list(struct ngbe_hw *hw, uint8_t *mc_addr_list,
>  	if (clear)
>  		memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
>  
> -	 /* Update mta_shadow */
> -	 for (i = 0; i < mc_addr_count; i++)
> -	 	ngbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq));
> +	/* Update mta_shadow */
> +	for (i = 0; i < mc_addr_count; i++)
> +		ngbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq));
>  
>  	/* Enable mta */
>  	for (i = 0; i < hw->mac.mcft_size; i++)
> diff --git sys/dev/pci/if_qwx_pci.c sys/dev/pci/if_qwx_pci.c
> index 46c20d84063..ccd5bfbc281 100644
> --- sys/dev/pci/if_qwx_pci.c
> +++ sys/dev/pci/if_qwx_pci.c
> @@ -2901,7 +2901,7 @@ qwx_mhi_start(struct qwx_pci_softc *psc)
>  #endif
>  
>  	/* Transition to primary runtime. */
> -	 if (MHI_IN_PBL(ee)) {
> +	if (MHI_IN_PBL(ee)) {
>  		ret = qwx_mhi_fw_load_handler(psc);
>  		if (ret)
>  			return ret;
> diff --git sys/dev/pci/if_rge.c sys/dev/pci/if_rge.c
> index 08aecaeca9e..ae457fb9874 100644
> --- sys/dev/pci/if_rge.c
> +++ sys/dev/pci/if_rge.c
> @@ -1250,7 +1250,7 @@ rge_rxeof(struct rge_queues *q)
>  			 * If this is part of a multi-fragment packet,
>  			 * discard all the pieces.
>  			 */
> -			 if (q->q_rx.rge_head != NULL) {
> +			if (q->q_rx.rge_head != NULL) {
>  				m_freem(q->q_rx.rge_head);
>  				q->q_rx.rge_head = q->q_rx.rge_tail = NULL;
>  			}
> diff --git sys/dev/pci/if_sis.c sys/dev/pci/if_sis.c
> index 7c658f71e7c..322975dc225 100644
> --- sys/dev/pci/if_sis.c
> +++ sys/dev/pci/if_sis.c
> @@ -1791,7 +1791,7 @@ sis_init(void *xsc)
>  	 * This resolves an issue with tons of errors in AcceptPerfectMatch
>  	 * (non-IFF_PROMISC) mode.
>  	 */
> -	 if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr <= NS_SRR_15D) {
> +	if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr <= NS_SRR_15D) {
>  		CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001);
>  		CSR_WRITE_4(sc, NS_PHY_CR, 0x189C);
>  		/* set val for c2 */
> diff --git sys/dev/pci/ixgb_hw.c sys/dev/pci/ixgb_hw.c
> index c65f3574dff..47468fdfe8f 100644
> --- sys/dev/pci/ixgb_hw.c
> +++ sys/dev/pci/ixgb_hw.c
> @@ -83,14 +83,14 @@ ixgb_mac_reset(struct ixgb_hw *hw)
>  {
>  	uint32_t ctrl_reg;
>  
> -    ctrl_reg =  IXGB_CTRL0_RST |
> -                IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
> -                IXGB_CTRL0_SDP2_DIR |
> -                IXGB_CTRL0_SDP1_DIR |
> -                IXGB_CTRL0_SDP0_DIR |
> -                IXGB_CTRL0_SDP3     |   /* Initial value 1101   */
> -                IXGB_CTRL0_SDP2     |
> -                IXGB_CTRL0_SDP0;
> +	ctrl_reg =  IXGB_CTRL0_RST |
> +	    IXGB_CTRL0_SDP3_DIR |   /* All pins are Output=1 */
> +	    IXGB_CTRL0_SDP2_DIR |
> +	    IXGB_CTRL0_SDP1_DIR |
> +	    IXGB_CTRL0_SDP0_DIR |
> +	    IXGB_CTRL0_SDP3     |   /* Initial value 1101   */
> +	    IXGB_CTRL0_SDP2     |
> +	    IXGB_CTRL0_SDP0;
>  
>  #ifdef HP_ZX1
>  	/* Workaround for 82597EX reset errata */
> diff --git sys/dev/pci/maestro.c sys/dev/pci/maestro.c
> index bbd0a3b1edf..2704ee94e16 100644
> --- sys/dev/pci/maestro.c
> +++ sys/dev/pci/maestro.c
> @@ -900,7 +900,7 @@ maestro_set_speed(struct maestro_channel *ch, u_long *prate)
>  	} else {
>  		/* compute 16 bits fixed point value of speed/48000,
>  		 * being careful not to overflow */
> -		 ch->dv = (((ch->speed % 48000) << 16U) + 24000) / 48000
> +		ch->dv = (((ch->speed % 48000) << 16U) + 24000) / 48000
>  		    + ((ch->speed / 48000) << 16U);
>  		/* And this is the real rate obtained */
>  		ch->speed = (ch->dv >> 16U) * 48000 + 
> diff --git sys/dev/pci/pciide.c sys/dev/pci/pciide.c
> index 53af79c8bb7..e367e77818d 100644
> --- sys/dev/pci/pciide.c
> +++ sys/dev/pci/pciide.c
> @@ -2939,8 +2939,8 @@ piix_setup_channel(struct channel_softc *chp)
>  	    (drvp[1].drive_flags & DRIVE_DMA)) {
>  		mode[0] = mode[1] =
>  		    min(drvp[0].DMA_mode, drvp[1].DMA_mode);
> -		    drvp[0].DMA_mode = mode[0];
> -		    drvp[1].DMA_mode = mode[1];
> +		drvp[0].DMA_mode = mode[0];
> +		drvp[1].DMA_mode = mode[1];
>  		goto ok;
>  	}
>  	/*
> @@ -4127,7 +4127,7 @@ cmd680_channel_map(struct pci_attach_args *pa, struct pciide_softc *sc,
>  		printf("%s %s: "
>  		    "cannot allocate channel queue",
>  		    sc->sc_wdcdev.sc_dev.dv_xname, cp->name);
> -		    return;
> +		return;
>  	}
>  
>  	/* XXX */
> @@ -7972,9 +7972,9 @@ acard_setup_channel(struct channel_softc *chp)
>  				    acard_act_pio[drvp->PIO_mode],
>  				    acard_rec_pio[drvp->PIO_mode]);
>  			}
> -		pci_conf_write(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL,
> -		    pci_conf_read(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL)
> -		    | ATP8x0_CTRL_EN(channel));
> +			pci_conf_write(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL,
> +			    pci_conf_read(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL) |
> +			    ATP8x0_CTRL_EN(channel));
>  		}
>  	}
>  
> diff --git sys/dev/usb/if_umb.c sys/dev/usb/if_umb.c
> index 0d0c2c4716f..f396bc5901b 100644
> --- sys/dev/usb/if_umb.c
> +++ sys/dev/usb/if_umb.c
> @@ -3135,7 +3135,7 @@ umb_intr(struct usbd_xfer *xfer, void *priv, usbd_status status)
>  	if (total_len < UCDC_NOTIFICATION_LENGTH) {
>  		DPRINTF("%s: short notification (%d<%d)\n", DEVNAM(sc),
>  		    total_len, UCDC_NOTIFICATION_LENGTH);
> -		    return;
> +		return;
>  	}
>  	if (sc->sc_intr_msg.bmRequestType != UCDC_NOTIFICATION) {
>  		DPRINTF("%s: unexpected notification (type=0x%02x)\n",
> diff --git sys/dev/usb/if_ure.c sys/dev/usb/if_ure.c
> index e26fb580277..4376027c450 100644
> --- sys/dev/usb/if_ure.c
> +++ sys/dev/usb/if_ure.c
> @@ -2078,7 +2078,7 @@ ure_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status)
>  		if (rxvlan & URE_RXPKT_VLAN_TAG) {
>  			m->m_pkthdr.ether_vtag =
>  			    swap16(rxvlan & URE_RXPKT_VLAN_DATA);
> -			 m->m_flags |= M_VLANTAG;
> +			m->m_flags |= M_VLANTAG;
>  		}
>  #endif
>  
> diff --git sys/dev/wscons/wsdisplay_compat_usl.c sys/dev/wscons/wsdisplay_compat_usl.c
> index 7398e8f399d..041e62a72c1 100644
> --- sys/dev/wscons/wsdisplay_compat_usl.c
> +++ sys/dev/wscons/wsdisplay_compat_usl.c
> @@ -440,9 +440,8 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
>  #define PCVT_SYSBEEPF	1193182
>  			if (d >> 16) {
>  				bd.which = WSKBD_BELL_DOPERIOD;
> -			bd.period = d >> 16; /* ms */
> -			}
> -			else
> +				bd.period = d >> 16; /* ms */
> +			} else
>  				bd.which = 0;
>  			if (d & 0xffff) {
>  				bd.which |= WSKBD_BELL_DOPITCH;
> diff --git sys/isofs/udf/udf_subr.c sys/isofs/udf/udf_subr.c
> index e7082085ceb..aaa506b68c9 100644
> --- sys/isofs/udf/udf_subr.c
> +++ sys/isofs/udf/udf_subr.c
> @@ -201,7 +201,7 @@ udf_vat_get(struct umount *ump, uint32_t lb)
>  	up->u_vatlen = (letoh64(up->u_fentry->inf_len) - 36) >> 2;
>  
>  	ump->um_vat = malloc(sizeof(struct unode), M_UDFMOUNT, M_WAITOK);
> -       *ump->um_vat = *up;
> +	*ump->um_vat = *up;
>  
>  	ump->um_flags &= ~UDF_MNT_FIND_VAT;
>  	ump->um_flags |=  UDF_MNT_USES_VAT;
> diff --git sys/kern/kern_acct.c sys/kern/kern_acct.c
> index 590bed70426..12ae514601a 100644
> --- sys/kern/kern_acct.c
> +++ sys/kern/kern_acct.c
> @@ -270,7 +270,7 @@ encode_comp_t(u_long s, u_long ns)
>  	s += ns / (1000000000 / AHZ);	/* Maximize precision. */
>  
>  	while (s > MAXFRACT) {
> -	rnd = s & (1 << (EXPSIZE - 1));	/* Round up? */
> +		rnd = s & (1 << (EXPSIZE - 1));	/* Round up? */
>  		s >>= EXPSIZE;		/* Base 8 exponent == 3 bit shift. */
>  		exp++;
>  	}
> diff --git sys/net/pf_osfp.c sys/net/pf_osfp.c
> index c2a406c32b2..8cffcf236bb 100644
> --- sys/net/pf_osfp.c
> +++ sys/net/pf_osfp.c
> @@ -382,7 +382,7 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc)
>  	if ((fp = pf_osfp_find_exact(&fpadd))) {
>  		struct pf_osfp_entry *tentry;
>  
> -		 SLIST_FOREACH(tentry, &fp->fp_oses, fp_entry) {
> +		SLIST_FOREACH(tentry, &fp->fp_oses, fp_entry) {
>  			if (PF_OSFP_ENTRY_EQ(tentry, &fpioc->fp_os)) {
>  				PF_UNLOCK();
>  				pool_put(&pf_osfp_entry_pl, entry);
> diff --git sys/net80211/ieee80211_input.c sys/net80211/ieee80211_input.c
> index 44f1189405f..8643b3cedbf 100644
> --- sys/net80211/ieee80211_input.c
> +++ sys/net80211/ieee80211_input.c
> @@ -1901,7 +1901,7 @@ ieee80211_recv_probe_resp(struct ieee80211com *ic, struct mbuf *m,
>  		 * This probe response indicates the AP is still serving us
>  		 * so don't allow ieee80211_watchdog() to move us into SCAN.
>  		 */
> -		 if ((ic->ic_flags & IEEE80211_F_BGSCAN) == 0)
> +		if ((ic->ic_flags & IEEE80211_F_BGSCAN) == 0)
>  		 	ic->ic_mgt_timer = 0;
>  	}
>  	/*
> diff --git sys/netinet/tcp_input.c sys/netinet/tcp_input.c
> index 7bd9e07e399..0ce540ce258 100644
> --- sys/netinet/tcp_input.c
> +++ sys/netinet/tcp_input.c
> @@ -1077,12 +1077,13 @@ findpcb:
>  	 * Receive window is amount of space in rcv queue,
>  	 * but not less than advertised window.
>  	 */
> -	{ int win;
> +	{
> +		int win;
>  
> -	win = sbspace(so, &so->so_rcv);
> -	if (win < 0)
> -		win = 0;
> -	tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt));
> +		win = sbspace(so, &so->so_rcv);
> +		if (win < 0)
> +			win = 0;
> +		tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt));
>  	}
>  
>  	switch (tp->t_state) {
> diff --git sys/nfs/nfs_vnops.c sys/nfs/nfs_vnops.c
> index bda27cd745e..f92704d751c 100644
> --- sys/nfs/nfs_vnops.c
> +++ sys/nfs/nfs_vnops.c
> @@ -336,9 +336,9 @@ nfs_access(void *v)
>  	 * Check access cache first. If a request has been made for this uid
>  	 * shortly before, use the cached result.
>  	 */
> -	 cachevalid = (np->n_accstamp != -1 &&
> -	     (gettime() - np->n_accstamp) < nfs_attrtimeo(np) &&
> -	     np->n_accuid == ap->a_cred->cr_uid);
> +	cachevalid = (np->n_accstamp != -1 &&
> +	    (gettime() - np->n_accstamp) < nfs_attrtimeo(np) &&
> +	    np->n_accuid == ap->a_cred->cr_uid);
>  
>  	if (cachevalid) {
>  		if (!np->n_accerror) {
> @@ -408,7 +408,7 @@ nfs_access(void *v)
>  	 * If we got the same result as for a previous, different request, OR
>  	 * it in. Don't update the timestamp in that case.
>  	 */
> -	 if (!error || error == EACCES) {
> +	if (!error || error == EACCES) {
>  		if (cachevalid && np->n_accstamp != -1 &&
>  		    error == np->n_accerror) {
>  			if (!error)
> diff --git sys/ufs/ext2fs/ext2fs_bmap.c sys/ufs/ext2fs/ext2fs_bmap.c
> index 4d5c6099532..1d5b314bdb9 100644
> --- sys/ufs/ext2fs/ext2fs_bmap.c
> +++ sys/ufs/ext2fs/ext2fs_bmap.c
> @@ -192,7 +192,7 @@ ext2fs_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp,
>  	devvp = VFSTOUFS(vp->v_mount)->um_devvp;
>  
>  #ifdef DIAGNOSTIC
> -    if (num > NIADDR + 1 || num < 1) {
> +	if (num > NIADDR + 1 || num < 1) {
>  		printf("ext2fs_bmaparray: num=%d\n", num);
>  		panic("ext2fs_bmaparray: num");
>  	}
> diff --git sys/ufs/ext2fs/ext2fs_vnops.c sys/ufs/ext2fs/ext2fs_vnops.c
> index eee8e11f8f1..f91d4856f63 100644
> --- sys/ufs/ext2fs/ext2fs_vnops.c
> +++ sys/ufs/ext2fs/ext2fs_vnops.c
> @@ -819,7 +819,7 @@ abortit:
>  				UIO_SYSSPACE, IO_NODELOCKED,
>  				tcnp->cn_cred, NULL, curproc);
>  			if (error == 0) {
> -					namlen = dirbuf.dotdot_namlen;
> +				namlen = dirbuf.dotdot_namlen;
>  				if (namlen != 2 ||
>  				    dirbuf.dotdot_name[0] != '.' ||
>  				    dirbuf.dotdot_name[1] != '.') {
> diff --git sys/ufs/ffs/ffs_balloc.c sys/ufs/ffs/ffs_balloc.c
> index 47e27348932..c1fc6e212f6 100644
> --- sys/ufs/ffs/ffs_balloc.c
> +++ sys/ufs/ffs/ffs_balloc.c
> @@ -750,7 +750,7 @@ fail:
>  		 * that we resolve the dependencies in one pass.
>  		 * Write the cylinder group buffers for these buffers too.
>  		 */
> -		 for (i = num; i >= unwindidx; i--) {
> +		for (i = num; i >= unwindidx; i--) {
>  		 	if (i == 0)
>  				break;
>  
> diff --git sys/uvm/uvm_addr.c sys/uvm/uvm_addr.c
> index 6e3b02d5c09..65d7dbb0b32 100644
> --- sys/uvm/uvm_addr.c
> +++ sys/uvm/uvm_addr.c
> @@ -1406,7 +1406,7 @@ uaddr_stack_brk_select(struct vm_map *map, struct uvm_addr_state *uaddr,
>  		if (uvm_addr_linsearch(map, uaddr, entry_out, addr_out,
>  		    0, sz, align, offset, dir, start, end - sz,
>  		    before_gap, after_gap) == 0)
> -		return 0;
> +			return 0;
>  	}
>  
>  	return ENOMEM;
> diff --git sys/uvm/uvm_aobj.c sys/uvm/uvm_aobj.c
> index 89389d5cabe..a0f86242d31 100644
> --- sys/uvm/uvm_aobj.c
> +++ sys/uvm/uvm_aobj.c
> @@ -298,7 +298,7 @@ uao_set_swslot(struct uvm_object *uobj, int pageidx, int slot)
>  
>  		/* but a set is not */
>  		printf("uao_set_swslot: uobj = %p\n", uobj);
> -	    panic("uao_set_swslot: attempt to set a slot on a NOSWAP object");
> +	    	panic("uao_set_swslot: attempt to set a slot on a NOSWAP object");
>  	}
>  
>  	/*