diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 39e4f61..3d84694 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -113,10 +113,10 @@ static const char *xhfc_state_name(bool is_nt, enum xhfc_states state) #define A_SU_WR_STA 0x30 /* ST/Up state machine register */ #define V_SU_LD_STA 0x10 -#define V_SU_ACT 0x60 /* start activation/deactivation */ -#define STA_DEACTIVATE 0x40 /* start deactivation in A_SU_WR_STA */ -#define STA_ACTIVATE 0x60 /* start activation in A_SU_WR_STA */ -#define V_SU_SET_G2_G3 0x80 +#define V_SU_ACT 0x60 /* start activation/deactivation */ +#define STA_DEACTIVATE 0x40 /* start deactivation in A_SU_WR_STA */ +#define STA_ACTIVATE 0x60 /* start activation in A_SU_WR_STA */ +#define V_SU_SET_G2_G3 0x80 #define A_SU_RD_STA 0x30 typedef union { diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index 6a069bd..1b1c5ac 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -197,7 +197,7 @@ static void reset_battery_readings(xpd_t *xpd, lineno_t pos) power_change(xpd, pos, POWER_UNKNOWN); } -static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) }; +static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) }; /* * LED control is done via DAA register 0x20 @@ -781,7 +781,7 @@ static const char echotune_regs[sizeof(struct wctdm_echo_coefs)] = {30, 45, 46, static int FXO_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long arg) { - int i,ret; + int i,ret; unsigned char echotune_data[ARRAY_SIZE(echotune_regs)]; BUG_ON(!xpd); diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index 91a1333..cb13821 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -195,34 +195,34 @@ static void vmwi_search(xpd_t *xpd, lineno_t pos, bool on) /* * LED and RELAY control is done via SLIC register 0x06: * 7 6 5 4 3 2 1 0 - * +-----+-----+-----+-----+-----+-----+-----+-----+ - * | M2 | M1 | M3 | C2 | O1 | O3 | C1 | C3 | - * +-----+-----+-----+-----+-----+-----+-----+-----+ + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | M2 | M1 | M3 | C2 | O1 | O3 | C1 | C3 | + * +-----+-----+-----+-----+-----+-----+-----+-----+ * - * Cn - Control bit (control one digital line) - * On - Output bit (program a digital line for output) - * Mn - Mask bit (only the matching output control bit is affected) + * Cn - Control bit (control one digital line) + * On - Output bit (program a digital line for output) + * Mn - Mask bit (only the matching output control bit is affected) * - * C3 - OUTPUT RELAY (0 - OFF, 1 - ON) - * C1 - GREEN LED (0 - OFF, 1 - ON) - * O3 - Output RELAY (this line is output) - * O1 - Output GREEN (this line is output) - * C2 - RED LED (0 - OFF, 1 - ON) - * M3 - Mask RELAY. (1 - C3 effect the OUTPUT RELAY) - * M2 - Mask RED. (1 - C2 effect the RED LED) - * M1 - Mask GREEN. (1 - C1 effect the GREEN LED) + * C3 - OUTPUT RELAY (0 - OFF, 1 - ON) + * C1 - GREEN LED (0 - OFF, 1 - ON) + * O3 - Output RELAY (this line is output) + * O1 - Output GREEN (this line is output) + * C2 - RED LED (0 - OFF, 1 - ON) + * M3 - Mask RELAY. (1 - C3 effect the OUTPUT RELAY) + * M2 - Mask RED. (1 - C2 effect the RED LED) + * M1 - Mask GREEN. (1 - C1 effect the GREEN LED) * - * The OUTPUT RELAY (actually a relay out) is connected to line 0 and 4 only. + * The OUTPUT RELAY (actually a relay out) is connected to line 0 and 4 only. */ -// GREEN RED OUTPUT RELAY -static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) }; -static const int led_register_vals[] = { BIT(4), BIT(1), BIT(0) }; +// GREEN RED OUTPUT RELAY +static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) }; +static const int led_register_vals[] = { BIT(4), BIT(1), BIT(0) }; /* * pos can be: - * - A line number - * - ALL_LINES. This is not valid anymore since 8-Jan-2007. + * - A line number + * - ALL_LINES. This is not valid anymore since 8-Jan-2007. */ static int do_led(xpd_t *xpd, lineno_t chan, byte which, bool on) { @@ -1039,9 +1039,9 @@ static int FXS_card_close(xpd_t *xpd, lineno_t chan) /* * INPUT polling is done via SLIC register 0x06 (same as LEDS): * 7 6 5 4 3 2 1 0 - * +-----+-----+-----+-----+-----+-----+-----+-----+ - * | I1 | I3 | | | I2 | I4 | | | - * +-----+-----+-----+-----+-----+-----+-----+-----+ + * +-----+-----+-----+-----+-----+-----+-----+-----+ + * | I1 | I3 | | | I2 | I4 | | | + * +-----+-----+-----+-----+-----+-----+-----+-----+ * */ static int input_channels[] = { 6, 7, 2, 3 }; // Slic numbers of input relays diff --git a/drivers/dahdi/xpp/card_global.c b/drivers/dahdi/xpp/card_global.c index e0b56fd..51edd7d 100644 --- a/drivers/dahdi/xpp/card_global.c +++ b/drivers/dahdi/xpp/card_global.c @@ -258,7 +258,7 @@ static int execute_chip_command(xpd_t *xpd, const int argc, char *argv[]) writing, /* writing */ regnum, do_subreg, /* use subreg */ - subreg, /* subreg */ + subreg, /* subreg */ data_low, do_datah, /* use data_high*/ data_high); diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index f0157de..286c348 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -85,10 +85,10 @@ static int apply_pri_protocol(xpd_t *xpd); #define PROC_REGISTER_FNAME "slics" enum pri_protocol { - PRI_PROTO_0 = 0, + PRI_PROTO_0 = 0, PRI_PROTO_E1 = 1, - PRI_PROTO_T1 = 2, - PRI_PROTO_J1 = 3 + PRI_PROTO_T1 = 2, + PRI_PROTO_J1 = 3 }; static const char *protocol_names[] = { diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index c544963..d4db723 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -266,7 +266,7 @@ void dump_xframe(const char msg[], const xbus_t *xbus, const xframe_t *xframe, i xpacket_t *pack; uint16_t pos = 0; uint16_t nextpos; - int num = 1; + int num = 1; bool do_print; unsigned long flags; @@ -350,8 +350,8 @@ void dump_xframe(const char msg[], const xbus_t *xbus, const xframe_t *xframe, i /** * * Frame is freed: - * - In case of error, by this function. - * - Otherwise, by the underlying sending mechanism + * - In case of error, by this function. + * - Otherwise, by the underlying sending mechanism */ int send_pcm_frame(xbus_t *xbus, xframe_t *xframe) { diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c index 9b51011..44168b9 100644 --- a/drivers/dahdi/xpp/xbus-pcm.c +++ b/drivers/dahdi/xpp/xbus-pcm.c @@ -63,7 +63,7 @@ static struct xpp_ticker global_ticks_series; #define PROC_SYNC "sync" #define SYNC_CYCLE 500 /* Sampling cycle in usec */ -#define SYNC_CYCLE_SAMPLE 100 /* Samples from end of SYNC_CYCLE */ +#define SYNC_CYCLE_SAMPLE 100 /* Samples from end of SYNC_CYCLE */ #define SYNC_CONVERGE 10 /* Number of SYNC_CYCLE's to converge speed */ #define SYNC_CENTER 500 /* Offset from ref_ticker to other AB's */ #define SYNC_DELTA 40 /* If within +/-SYNC_DELTA, try to stay there */ diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c index 71c4920..c0aaf45 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c @@ -442,7 +442,7 @@ static struct bus_type toplevel_bus_type = { .name = "astribanks", .match = astribank_match, #ifdef OLD_HOTPLUG_SUPPORT - .hotplug = astribank_hotplug, + .hotplug = astribank_hotplug, #else .uevent = astribank_uevent, #endif diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index ad83555..01b3bd8 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -1031,7 +1031,7 @@ static void __exit xpp_usb_shutdown(void) static int xusb_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { - int len = 0; + int len = 0; unsigned long flags; int i; //unsigned long stamp = jiffies; diff --git a/drivers/dahdi/xpp/xproto.h b/drivers/dahdi/xpp/xproto.h index 2d5f88c..92d7ab0 100644 --- a/drivers/dahdi/xpp/xproto.h +++ b/drivers/dahdi/xpp/xproto.h @@ -71,8 +71,8 @@ struct xpacket_header { /* * The LSB of the type number signifies: - * 0 - TO_PSTN - * 1 - TO_PHONE + * 0 - TO_PSTN + * 1 - TO_PHONE */ #define XPD_TYPE_FXS 1 // TO_PHONE #define XPD_TYPE_FXO 2 // TO_PSTN