kernel: Fix various indentation issues (no functional change).
authorSascha Wildner <saw@online.de>
Sun, 25 May 2014 08:38:41 +0000 (10:38 +0200)
committerSascha Wildner <saw@online.de>
Sun, 25 May 2014 08:38:41 +0000 (10:38 +0200)
sys/bus/u4b/usb_pf.c
sys/dev/misc/ppi/ppi.c
sys/dev/misc/syscons/syscons.c
sys/dev/netif/ath/ath_hal/ar5416/ar5416_reset.c
sys/dev/sound/pci/spicds.c
sys/net/netmap/netmap_vale.c
sys/netgraph7/ng_vlan.c
sys/vfs/msdosfs/msdosfs_conv.c

index d358369..a0a21a7 100644 (file)
@@ -157,7 +157,7 @@ usbpf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
        error = ifc_name2unit(name, &unit);
        if (error)
                return (error);
-       if (unit < 0)
+       if (unit < 0)
                return (EINVAL);
 
        ubus = usbpf_ifname2ubus(name);
index 6c0c5cd..00f4957 100644 (file)
@@ -447,7 +447,7 @@ ppiwrite(struct dev_write_args *ap)
        if (ppb_1284_get_state(ppbus) < PPB_PERIPHERAL_NEGOCIATION)
                ppb_1284_terminate(ppbus);
 
-       while (ppb_1284_get_state(ppbus) != PPB_PERIPHERAL_IDLE) {
+       while (ppb_1284_get_state(ppbus) != PPB_PERIPHERAL_IDLE) {
                /* XXX should check a variable before sleeping */
 #ifdef DEBUG_1284
                kprintf("s");
index 6419295..eff5252 100644 (file)
@@ -3338,21 +3338,23 @@ next_code:
 
        case SPCLKEY | FKEY | F(51):  /* page up key */
            sc_remove_cutmarking(scp);
-           for (i=0; i<scp->ysize; i++)
-           if (sc_hist_up_line(scp)) {
-               if (!(flags & SCGETC_CN))
-                   sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
-               break;
+           for (i=0; i<scp->ysize; i++) {
+               if (sc_hist_up_line(scp)) {
+                   if (!(flags & SCGETC_CN))
+                       sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+                   break;
+               }
            }
            goto next_code;
 
        case SPCLKEY | FKEY | F(59):  /* page down key */
            sc_remove_cutmarking(scp);
-           for (i=0; i<scp->ysize; i++)
-           if (sc_hist_down_line(scp)) {
-               if (!(flags & SCGETC_CN))
-                   sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
-               break;
+           for (i=0; i<scp->ysize; i++) {
+               if (sc_hist_down_line(scp)) {
+                   if (!(flags & SCGETC_CN))
+                       sc_bell(scp, bios_value.bell_pitch, BELL_DURATION);
+                   break;
+               }
            }
            goto next_code;
        }
index bb87ca9..8ad65be 100644 (file)
@@ -2730,7 +2730,7 @@ ar5416EepromSetAddac(struct ath_hal *ah, const struct ieee80211_channel *chan)
 
                while (freqCount < 3) {
                        if (XPA_LVL_FREQ(freqCount) == 0x0)
-                       break;
+                               break;
 
                        freqBin = XPA_LVL_FREQ(freqCount) & 0xff;
                        if (resetFreqBin >= freqBin)
index e9098a3..d4cb980 100644 (file)
@@ -204,37 +204,39 @@ spicds_init(struct spicds_info *codec)
        snd_mtxlock(codec->lock);
        if (codec->type == SPICDS_TYPE_AK4524 ||\
            codec->type == SPICDS_TYPE_AK4528) {
-       /* power off */
-       spicds_wrcd(codec, AK4524_POWER, 0);
-       /* set parameter */
-       spicds_wrcd(codec, AK4524_FORMAT, codec->format);
-       spicds_wrcd(codec, AK4524_DVC, codec->dvc);
-       /* power on */
-       spicds_wrcd(codec, AK4524_POWER, AK452X_POWER_PWDA | AK452X_POWER_PWAD | AK452X_POWER_PWVR);
-       /* free reset register */
-       spicds_wrcd(codec, AK4524_RESET, AK452X_RESET_RSDA | AK452X_RESET_RSAD);
+               /* power off */
+               spicds_wrcd(codec, AK4524_POWER, 0);
+               /* set parameter */
+               spicds_wrcd(codec, AK4524_FORMAT, codec->format);
+               spicds_wrcd(codec, AK4524_DVC, codec->dvc);
+               /* power on */
+               spicds_wrcd(codec, AK4524_POWER,
+                   AK452X_POWER_PWDA | AK452X_POWER_PWAD | AK452X_POWER_PWVR);
+               /* free reset register */
+               spicds_wrcd(codec, AK4524_RESET,
+                   AK452X_RESET_RSDA | AK452X_RESET_RSAD);
        }
        if (codec->type == SPICDS_TYPE_WM8770) {
-       /* WM8770 init values are taken from ALSA */
-        /* These come first to reduce init pop noise */
-       spicds_wrcd(codec, 0x1b, 0x044);        /* ADC Mux (AC'97 source) */
-       spicds_wrcd(codec, 0x1c, 0x00B);        /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
-       spicds_wrcd(codec, 0x1d, 0x009);        /* Out Mux2 (VOUT2 = DAC, VOUT3 = DAC) */
+               /* WM8770 init values are taken from ALSA */
+               /* These come first to reduce init pop noise */
+               spicds_wrcd(codec, 0x1b, 0x044);        /* ADC Mux (AC'97 source) */
+               spicds_wrcd(codec, 0x1c, 0x00B);        /* Out Mux1 (VOUT1 = DAC+AUX, VOUT2 = DAC) */
+               spicds_wrcd(codec, 0x1d, 0x009);        /* Out Mux2 (VOUT2 = DAC, VOUT3 = DAC) */
 
-       spicds_wrcd(codec, 0x18, 0x000);        /* All power-up */
+               spicds_wrcd(codec, 0x18, 0x000);        /* All power-up */
 
-       spicds_wrcd(codec, 0x16, 0x122);        /* I2S, normal polarity, 24bit */
-       spicds_wrcd(codec, 0x17, 0x022);        /* 256fs, slave mode */
+               spicds_wrcd(codec, 0x16, 0x122);        /* I2S, normal polarity, 24bit */
+               spicds_wrcd(codec, 0x17, 0x022);        /* 256fs, slave mode */
 
-       spicds_wrcd(codec, 0x19, 0x000);        /* -12dB ADC/L */
-       spicds_wrcd(codec, 0x1a, 0x000);        /* -12dB ADC/R */ 
+               spicds_wrcd(codec, 0x19, 0x000);        /* -12dB ADC/L */
+               spicds_wrcd(codec, 0x1a, 0x000);        /* -12dB ADC/R */ 
        }
        if (codec->type == SPICDS_TYPE_AK4358) 
-       spicds_wrcd(codec, 0x00, 0x07);         /* I2S, 24bit, power-up */
+               spicds_wrcd(codec, 0x00, 0x07);         /* I2S, 24bit, power-up */
        if (codec->type == SPICDS_TYPE_AK4381)
-       spicds_wrcd(codec, 0x00, 0x0f);         /* I2S, 24bit, power-up */
+               spicds_wrcd(codec, 0x00, 0x0f);         /* I2S, 24bit, power-up */
        if (codec->type == SPICDS_TYPE_AK4396)
-       spicds_wrcd(codec, 0x00, 0x07);         /* I2S, 24bit, power-up */
+               spicds_wrcd(codec, 0x00, 0x07);         /* I2S, 24bit, power-up */
        snd_mtxunlock(codec->lock);
 }
 
@@ -243,18 +245,18 @@ spicds_reinit(struct spicds_info *codec)
 {
        snd_mtxlock(codec->lock);
        if (codec->type != SPICDS_TYPE_WM8770) {
-       /* reset */
-       spicds_wrcd(codec, AK4524_RESET, 0);
-       /* set parameter */
-       spicds_wrcd(codec, AK4524_FORMAT, codec->format);
-       spicds_wrcd(codec, AK4524_DVC, codec->dvc);
-       /* free reset register */
-       spicds_wrcd(codec, AK4524_RESET, AK452X_RESET_RSDA | AK452X_RESET_RSAD);
-       }
-       else {
-       /* WM8770 reinit */
-       /* AK4358 reinit */
-       /* AK4381 reinit */
+               /* reset */
+               spicds_wrcd(codec, AK4524_RESET, 0);
+               /* set parameter */
+               spicds_wrcd(codec, AK4524_FORMAT, codec->format);
+               spicds_wrcd(codec, AK4524_DVC, codec->dvc);
+               /* free reset register */
+               spicds_wrcd(codec, AK4524_RESET,
+                   AK452X_RESET_RSDA | AK452X_RESET_RSAD);
+       else {
+               /* WM8770 reinit */
+               /* AK4358 reinit */
+               /* AK4381 reinit */
        }
        snd_mtxunlock(codec->lock);
 }
index ecfb708..6a070e7 100644 (file)
@@ -1545,7 +1545,7 @@ bdg_netmap_attach(struct netmap_adapter *arg)
        vpna = kmalloc(sizeof(*vpna), M_DEVBUF, M_NOWAIT | M_ZERO);
        if (vpna == NULL)
                return ENOMEM;
-       na = &vpna->up;
+       na = &vpna->up;
        *na = *arg;
        na->na_flags |= NAF_BDG_MAYSLEEP | NAF_MEM_OWNER;
        na->nm_txsync = bdg_netmap_txsync;
index 0b064b2..506b519 100644 (file)
@@ -26,7 +26,6 @@
  * Author: Ruslan Ermilov <ru@FreeBSD.org>
  *
  * $FreeBSD: src/sys/netgraph/ng_vlan.c,v 1.5 2007/06/11 15:29:02 imp Exp $
- * $DragonFly: src/sys/netgraph7/ng_vlan.c,v 1.2 2008/06/26 23:05:35 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -319,12 +318,13 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook)
 
                /* Broadcast the event to all uplinks. */
                for (i = 0, chain = priv->hashtable; i < HASHSIZE;
-                   i++, chain++)
-               LIST_FOREACH(f, chain, next) {
-                       NG_COPYMESSAGE(copy, msg, M_WAITOK | M_NULLOK);
-                       if (copy == NULL)
-                               continue;
-                       NG_SEND_MSG_HOOK(error, node, copy, f->hook, 0);
+                   i++, chain++) {
+                       LIST_FOREACH(f, chain, next) {
+                               NG_COPYMESSAGE(copy, msg, M_WAITOK | M_NULLOK);
+                               if (copy == NULL)
+                                       continue;
+                               NG_SEND_MSG_HOOK(error, node, copy, f->hook, 0);
+                       }
                }
 
                break;
index ee3659d..e355840 100644 (file)
@@ -1192,7 +1192,7 @@ winSlotCnt(const u_char *un, size_t unlen, struct msdosfsmount *pmp)
        }
        if (unlen > WIN_MAXLEN)
                return 0;
-        return howmany(unlen, WIN_CHARS);
+       return howmany(unlen, WIN_CHARS);
 }
 
 /*