From 5312dbe9bd44f354f35b3b77649e4fc580100f0c Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 24 Aug 2006 02:53:26 -0400 Subject: Trim trailing whitespace. --- ethtool.c | 22 +++++++++++----------- fec_8xx.c | 2 +- ibm_emac.c | 10 +++++----- skge.c | 26 +++++++++++++------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ethtool.c b/ethtool.c index c44c614..87e22ab 100644 --- a/ethtool.c +++ b/ethtool.c @@ -88,11 +88,11 @@ static enum { MODE_GSTATS, } mode = MODE_GSET; -static struct option { +static struct option { char *srt, *lng; int Mode; char *help; - char *opthelp; + char *opthelp; } args[] = { { "-s", "--change", MODE_SSET, "Change generic options", " [ speed 10|100|1000 ]\n" @@ -147,7 +147,7 @@ static struct option { " [ tso on|off ]\n" " [ ufo on|off ]\n" " [ gso on|off ]\n" }, - { "-i", "--driver", MODE_GDRV, "Show driver information" }, + { "-i", "--driver", MODE_GDRV, "Show driver information" }, { "-d", "--register-dump", MODE_GREGS, "Do a register dump" }, { "-e", "--eeprom-dump", MODE_GEEPROM, "Do a EEPROM dump", " [ raw on|off ]\n" @@ -156,7 +156,7 @@ static struct option { { "-E", "--change-eeprom", MODE_SEEPROM, "Change bytes in device EEPROM", " [ magic N ]\n" " [ offset N ]\n" - " [ value N ]\n" }, + " [ value N ]\n" }, { "-r", "--negotiate", MODE_NWAY_RST, "Restart N-WAY negotation" }, { "-p", "--identify", MODE_PHYS_ID, "Show visible port identification (e.g. blinking)", " [ TIME-IN-SECONDS ]\n" }, @@ -174,11 +174,11 @@ static void show_usage(int badarg) fprintf(stderr, PACKAGE " version " VERSION "\n"); fprintf(stderr, "Usage:\n" - "ethtool DEVNAME\tDisplay standard information about device\n"); + "ethtool DEVNAME\tDisplay standard information about device\n"); for (i = 0; args[i].srt; i++) { fprintf(stderr, " ethtool %s|%s DEVNAME\t%s\n%s", - args[i].srt, args[i].lng, - args[i].help, + args[i].srt, args[i].lng, + args[i].help, args[i].opthelp ? args[i].opthelp : ""); } exit(badarg); @@ -381,13 +381,13 @@ static void parse_cmdline(int argc, char **argp) for (i = 1; i < argc; i++) { switch (i) { case 1: - for (k = 0; args[k].srt; k++) + for (k = 0; args[k].srt; k++) if (!strcmp(argp[i], args[k].srt) || - !strcmp(argp[i], args[k].lng)) { + !strcmp(argp[i], args[k].lng)) { mode = args[k].Mode; break; - } - if (mode == MODE_HELP || + } + if (mode == MODE_HELP || (!args[k].srt && argp[i][0] == '-')) show_usage(0); else diff --git a/fec_8xx.c b/fec_8xx.c index 969a14e..06a25d9 100644 --- a/fec_8xx.c +++ b/fec_8xx.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2004 Intracom S.A. * Pantelis Antoniou */ diff --git a/ibm_emac.c b/ibm_emac.c index b2dfffa..7974836 100644 --- a/ibm_emac.c +++ b/ibm_emac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005 Zultys Technologies + * Copyright (c) 2004, 2005 Zultys Technologies * Eugene Surovegin or */ #include @@ -9,13 +9,13 @@ #include "ethtool-util.h" /* Ethtool get_regs complex data. - * we want to get not just EMAC registers, but also MAL, ZMII, RGMII, TAH + * we want to get not just EMAC registers, but also MAL, ZMII, RGMII, TAH * when available. - * - * Returned BLOB consists of the ibm_emac_ethtool_regs_hdr, + * + * Returned BLOB consists of the ibm_emac_ethtool_regs_hdr, * MAL registers, EMAC registers and optional ZMII, RGMII, TAH registers. * Each register component is preceded with emac_ethtool_regs_subhdr. - * Order of the optional headers follows their relative bit posititions + * Order of the optional headers follows their relative bit posititions * in emac_ethtool_regs_hdr.components */ #define EMAC_ETHTOOL_REGS_ZMII 0x00000001 diff --git a/skge.c b/skge.c index e19553e..23282f5 100644 --- a/skge.c +++ b/skge.c @@ -20,7 +20,7 @@ static void dump_timer(const char *name, const void *p) { const u8 *a = p; const u32 *r = p; - + printf("%s\n", name); printf("\tInit 0x%08X Value 0x%08X\n", r[0], r[1]); printf("\tTest 0x%02X Control 0x%02X\n", a[8], a[9]); @@ -51,9 +51,9 @@ static void dump_queue(const char *name, const void *a, int rx) printf("\n%s\n", name); printf("---------------\n"); - printf("Descriptor Address 0x%08X%08X\n", + printf("Descriptor Address 0x%08X%08X\n", d->addr_hi, d->addr_lo); - printf("Address Counter 0x%08X%08X\n", + printf("Address Counter 0x%08X%08X\n", d->count_hi, d->count_lo); printf("Current Byte Counter %d\n", d->byte_count); printf("BMU Control/Status 0x%08X\n", d->csr); @@ -61,17 +61,17 @@ static void dump_queue(const char *name, const void *a, int rx) printf("\n"); printf("Control 0x%08X\n", d->ctl); printf("Next 0x%08X\n", d->next); - printf("Data 0x%08X%08X\n", + printf("Data 0x%08X%08X\n", d->data_hi, d->data_lo); printf("Status 0x%08X\n", d->status); printf("Timestamp 0x%08X\n", d->timestamp); if (rx) { - printf("Csum1 Offset %4d Positon %d\n", + printf("Csum1 Offset %4d Positon %d\n", d->csum1, d->csum1_start); - printf("Csum2 Offset %4d Positon %d\n", + printf("Csum2 Offset %4d Positon %d\n", d->csum2, d->csum2_start); - } else - printf("Csum Start 0x%04X Pos %4d Write %d\n", + } else + printf("Csum Start 0x%04X Pos %4d Write %d\n", d->csum1, d->csum2_start, d->csum1_start); } @@ -118,7 +118,7 @@ int skge_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) printf("Control Registers\n"); printf("-----------------\n"); - + printf("Register Access Port 0x%08X\n", r[0]); printf("LED Control/Status 0x%08X\n", r[1]); printf("Interrupt Source 0x%08X\n", r[2]); @@ -145,13 +145,13 @@ int skge_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) dump_addr(3, regs->data + 0x110); printf("\n"); - printf("Connector type 0x%02X\n", + printf("Connector type 0x%02X\n", regs->data[0x118]); - printf("PMD type 0x%02X\n", + printf("PMD type 0x%02X\n", regs->data[0x119]); - printf("Configuration 0x%02X\n", + printf("Configuration 0x%02X\n", regs->data[0x11a]); - printf("Chip Revision 0x%02X\n", + printf("Chip Revision 0x%02X\n", regs->data[0x11b]); dump_timer("Timer", regs->data + 0x130); -- cgit v1.2.1