diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
| commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
| tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/lasat | |
| parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) | |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/lasat')
| -rw-r--r-- | arch/mips/lasat/at93c.c | 16 | ||||
| -rw-r--r-- | arch/mips/lasat/at93c.h | 4 | ||||
| -rw-r--r-- | arch/mips/lasat/ds1603.c | 12 | ||||
| -rw-r--r-- | arch/mips/lasat/ds1603.h | 6 | ||||
| -rw-r--r-- | arch/mips/lasat/image/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/lasat/image/head.S | 2 | ||||
| -rw-r--r-- | arch/mips/lasat/interrupt.c | 4 | ||||
| -rw-r--r-- | arch/mips/lasat/lasat_board.c | 8 | ||||
| -rw-r--r-- | arch/mips/lasat/picvue.c | 12 | ||||
| -rw-r--r-- | arch/mips/lasat/picvue.h | 4 | ||||
| -rw-r--r-- | arch/mips/lasat/picvue_proc.c | 10 | ||||
| -rw-r--r-- | arch/mips/lasat/prom.c | 2 | ||||
| -rw-r--r-- | arch/mips/lasat/reset.c | 2 | ||||
| -rw-r--r-- | arch/mips/lasat/setup.c | 4 | ||||
| -rw-r--r-- | arch/mips/lasat/sysctl.c | 26 |
15 files changed, 57 insertions, 57 deletions
diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c index f6add041ebec..ca26e554615e 100644 --- a/arch/mips/lasat/at93c.c +++ b/arch/mips/lasat/at93c.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Atmel AT93C46 serial eeprom driver | 2 | * Atmel AT93C46 serial eeprom driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| @@ -21,12 +21,12 @@ | |||
| 21 | 21 | ||
| 22 | struct at93c_defs *at93c; | 22 | struct at93c_defs *at93c; |
| 23 | 23 | ||
| 24 | static void at93c_reg_write(u32 val) | 24 | static void at93c_reg_write(u32 val) |
| 25 | { | 25 | { |
| 26 | *at93c->reg = val; | 26 | *at93c->reg = val; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | static u32 at93c_reg_read(void) | 29 | static u32 at93c_reg_read(void) |
| 30 | { | 30 | { |
| 31 | u32 tmp = *at93c->reg; | 31 | u32 tmp = *at93c->reg; |
| 32 | return tmp; | 32 | return tmp; |
| @@ -81,7 +81,7 @@ static u8 at93c_read_byte(void) | |||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static void at93c_write_bits(u32 data, int size) | 83 | static void at93c_write_bits(u32 data, int size) |
| 84 | { | 84 | { |
| 85 | int i; | 85 | int i; |
| 86 | int shift = size - 1; | 86 | int shift = size - 1; |
| 87 | u32 mask = (1 << shift); | 87 | u32 mask = (1 << shift); |
| @@ -90,7 +90,7 @@ static void at93c_write_bits(u32 data, int size) | |||
| 90 | at93c_write_databit((data & mask) >> shift); | 90 | at93c_write_databit((data & mask) >> shift); |
| 91 | data <<= 1; | 91 | data <<= 1; |
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | static void at93c_init_op(void) | 95 | static void at93c_init_op(void) |
| 96 | { | 96 | { |
| @@ -104,8 +104,8 @@ static void at93c_end_op(void) | |||
| 104 | lasat_ndelay(250); | 104 | lasat_ndelay(250); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | static void at93c_wait(void) | 107 | static void at93c_wait(void) |
| 108 | { | 108 | { |
| 109 | at93c_init_op(); | 109 | at93c_init_op(); |
| 110 | while (!at93c_read_databit()) | 110 | while (!at93c_read_databit()) |
| 111 | ; | 111 | ; |
diff --git a/arch/mips/lasat/at93c.h b/arch/mips/lasat/at93c.h index a912ac2171b0..cfe2f99b1d44 100644 --- a/arch/mips/lasat/at93c.h +++ b/arch/mips/lasat/at93c.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Atmel AT93C46 serial eeprom driver | 2 | * Atmel AT93C46 serial eeprom driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index 7bbf6cf923c9..9d7812e03dcd 100644 --- a/arch/mips/lasat/ds1603.c +++ b/arch/mips/lasat/ds1603.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Dallas Semiconductors 1603 RTC driver | 2 | * Dallas Semiconductors 1603 RTC driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| @@ -20,12 +20,12 @@ | |||
| 20 | struct ds_defs *ds1603 = NULL; | 20 | struct ds_defs *ds1603 = NULL; |
| 21 | 21 | ||
| 22 | /* HW specific register functions */ | 22 | /* HW specific register functions */ |
| 23 | static void rtc_reg_write(unsigned long val) | 23 | static void rtc_reg_write(unsigned long val) |
| 24 | { | 24 | { |
| 25 | *ds1603->reg = val; | 25 | *ds1603->reg = val; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | static unsigned long rtc_reg_read(void) | 28 | static unsigned long rtc_reg_read(void) |
| 29 | { | 29 | { |
| 30 | unsigned long tmp = *ds1603->reg; | 30 | unsigned long tmp = *ds1603->reg; |
| 31 | return tmp; | 31 | return tmp; |
| @@ -80,7 +80,7 @@ static unsigned int rtc_read_databit(void) | |||
| 80 | { | 80 | { |
| 81 | unsigned int data; | 81 | unsigned int data; |
| 82 | 82 | ||
| 83 | data = (rtc_datareg_read() & (1 << ds1603->data_read_shift)) | 83 | data = (rtc_datareg_read() & (1 << ds1603->data_read_shift)) |
| 84 | >> ds1603->data_read_shift; | 84 | >> ds1603->data_read_shift; |
| 85 | rtc_cycle_clock(rtc_reg_read()); | 85 | rtc_cycle_clock(rtc_reg_read()); |
| 86 | return data; | 86 | return data; |
diff --git a/arch/mips/lasat/ds1603.h b/arch/mips/lasat/ds1603.h index 55f3b0423c20..c2e5c76a379d 100644 --- a/arch/mips/lasat/ds1603.h +++ b/arch/mips/lasat/ds1603.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Dallas Semiconductors 1603 RTC driver | 2 | * Dallas Semiconductors 1603 RTC driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #ifndef __DS1603_H | 7 | #ifndef __DS1603_H |
diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile index 18b6430f11be..35ecd6483ef6 100644 --- a/arch/mips/lasat/image/Makefile +++ b/arch/mips/lasat/image/Makefile | |||
| @@ -21,7 +21,7 @@ LDSCRIPT= -L$(obj) -Tromscript.normal | |||
| 21 | HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ | 21 | HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ |
| 22 | -D_kernel_entry=0x$(KERNEL_ENTRY) \ | 22 | -D_kernel_entry=0x$(KERNEL_ENTRY) \ |
| 23 | -D VERSION="\"$(Version)\"" \ | 23 | -D VERSION="\"$(Version)\"" \ |
| 24 | -D TIMESTAMP=$(shell date +%s) | 24 | -D TIMESTAMP=$(shell date +%s) |
| 25 | 25 | ||
| 26 | $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) | 26 | $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) |
| 27 | $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< | 27 | $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< |
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S index 426bd7de17bb..efb95f2609c2 100644 --- a/arch/mips/lasat/image/head.S +++ b/arch/mips/lasat/image/head.S | |||
| @@ -27,5 +27,5 @@ reldate: | |||
| 27 | .word TIMESTAMP | 27 | .word TIMESTAMP |
| 28 | 28 | ||
| 29 | .org 0x50 | 29 | .org 0x50 |
| 30 | release: | 30 | release: |
| 31 | .string VERSION | 31 | .string VERSION |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 1148a2d20aa7..c90da1639440 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * with this program; if not, write to the Free Software Foundation, Inc., | 15 | * with this program; if not, write to the Free Software Foundation, Inc., |
| 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 17 | * | 17 | * |
| 18 | * Routines for generic manipulation of the interrupts found on the | 18 | * Routines for generic manipulation of the interrupts found on the |
| 19 | * Lasat boards. | 19 | * Lasat boards. |
| 20 | */ | 20 | */ |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| @@ -101,7 +101,7 @@ static unsigned long get_int_status_100(void) | |||
| 101 | return *lasat_int_status & *lasat_int_mask; | 101 | return *lasat_int_status & *lasat_int_mask; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | static unsigned long get_int_status_200(void) | 104 | static unsigned long get_int_status_200(void) |
| 105 | { | 105 | { |
| 106 | unsigned long int_status; | 106 | unsigned long int_status; |
| 107 | 107 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index 8c784bcf1111..fc9b0e2a6be1 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
| @@ -67,7 +67,7 @@ static void init_flash_sizes(void) | |||
| 67 | 67 | ||
| 68 | if (mips_machtype == MACH_LASAT_100) { | 68 | if (mips_machtype == MACH_LASAT_100) { |
| 69 | lasat_board_info.li_flash_base = 0x1e000000; | 69 | lasat_board_info.li_flash_base = 0x1e000000; |
| 70 | 70 | ||
| 71 | lb[LASAT_MTD_BOOTLOADER] = 0x1e400000; | 71 | lb[LASAT_MTD_BOOTLOADER] = 0x1e400000; |
| 72 | 72 | ||
| 73 | if (lasat_board_info.li_flash_size > 0x200000) { | 73 | if (lasat_board_info.li_flash_size > 0x200000) { |
| @@ -103,7 +103,7 @@ int lasat_init_board_info(void) | |||
| 103 | memset(&lasat_board_info, 0, sizeof(lasat_board_info)); | 103 | memset(&lasat_board_info, 0, sizeof(lasat_board_info)); |
| 104 | 104 | ||
| 105 | /* First read the EEPROM info */ | 105 | /* First read the EEPROM info */ |
| 106 | EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 106 | EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
| 107 | sizeof(struct lasat_eeprom_struct)); | 107 | sizeof(struct lasat_eeprom_struct)); |
| 108 | 108 | ||
| 109 | /* Check the CRC */ | 109 | /* Check the CRC */ |
| @@ -188,7 +188,7 @@ int lasat_init_board_info(void) | |||
| 188 | case 0x1: | 188 | case 0x1: |
| 189 | lasat_board_info.li_cpu_hz = | 189 | lasat_board_info.li_cpu_hz = |
| 190 | lasat_board_info.li_bus_hz + | 190 | lasat_board_info.li_bus_hz + |
| 191 | (lasat_board_info.li_bus_hz >> 1); | 191 | (lasat_board_info.li_bus_hz >> 1); |
| 192 | break; | 192 | break; |
| 193 | case 0x2: | 193 | case 0x2: |
| 194 | lasat_board_info.li_cpu_hz = | 194 | lasat_board_info.li_cpu_hz = |
| @@ -271,7 +271,7 @@ void lasat_write_eeprom_info(void) | |||
| 271 | lasat_board_info.li_eeprom_info.crc32 = crc; | 271 | lasat_board_info.li_eeprom_info.crc32 = crc; |
| 272 | 272 | ||
| 273 | /* Write the EEPROM info */ | 273 | /* Write the EEPROM info */ |
| 274 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 274 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
| 275 | sizeof(struct lasat_eeprom_struct)); | 275 | sizeof(struct lasat_eeprom_struct)); |
| 276 | } | 276 | } |
| 277 | 277 | ||
diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c index 5637cd153926..9ae82c3ffb07 100644 --- a/arch/mips/lasat/picvue.c +++ b/arch/mips/lasat/picvue.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| @@ -24,12 +24,12 @@ struct pvc_defs *picvue = NULL; | |||
| 24 | 24 | ||
| 25 | DECLARE_MUTEX(pvc_sem); | 25 | DECLARE_MUTEX(pvc_sem); |
| 26 | 26 | ||
| 27 | static void pvc_reg_write(u32 val) | 27 | static void pvc_reg_write(u32 val) |
| 28 | { | 28 | { |
| 29 | *picvue->reg = val; | 29 | *picvue->reg = val; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static u32 pvc_reg_read(void) | 32 | static u32 pvc_reg_read(void) |
| 33 | { | 33 | { |
| 34 | u32 tmp = *picvue->reg; | 34 | u32 tmp = *picvue->reg; |
| 35 | return tmp; | 35 | return tmp; |
| @@ -65,12 +65,12 @@ static u8 pvc_read_data(void) | |||
| 65 | { | 65 | { |
| 66 | u32 data = pvc_reg_read(); | 66 | u32 data = pvc_reg_read(); |
| 67 | u8 byte; | 67 | u8 byte; |
| 68 | data |= picvue->rw; | 68 | data |= picvue->rw; |
| 69 | data &= ~picvue->rs; | 69 | data &= ~picvue->rs; |
| 70 | pvc_reg_write(data); | 70 | pvc_reg_write(data); |
| 71 | ndelay(40); | 71 | ndelay(40); |
| 72 | byte = pvc_read_byte(data); | 72 | byte = pvc_read_byte(data); |
| 73 | data |= picvue->rs; | 73 | data |= picvue->rs; |
| 74 | pvc_reg_write(data); | 74 | pvc_reg_write(data); |
| 75 | return byte; | 75 | return byte; |
| 76 | } | 76 | } |
diff --git a/arch/mips/lasat/picvue.h b/arch/mips/lasat/picvue.h index 74a39039135d..2a96bf971897 100644 --- a/arch/mips/lasat/picvue.h +++ b/arch/mips/lasat/picvue.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <asm/semaphore.h> | 7 | #include <asm/semaphore.h> |
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c index eaa2b4625124..cce7cddcdb08 100644 --- a/arch/mips/lasat/picvue_proc.c +++ b/arch/mips/lasat/picvue_proc.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
| 3 | * | 3 | * |
| 4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
| 5 | * | 5 | * |
| 6 | */ | 6 | */ |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| @@ -51,10 +51,10 @@ static int pvc_proc_read_line(char *page, char **start, | |||
| 51 | page += sprintf(page, "%s\n", pvc_lines[lineno]); | 51 | page += sprintf(page, "%s\n", pvc_lines[lineno]); |
| 52 | up(&pvc_sem); | 52 | up(&pvc_sem); |
| 53 | 53 | ||
| 54 | return page - origpage; | 54 | return page - origpage; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | static int pvc_proc_write_line(struct file *file, const char *buffer, | 57 | static int pvc_proc_write_line(struct file *file, const char *buffer, |
| 58 | unsigned long count, void *data) | 58 | unsigned long count, void *data) |
| 59 | { | 59 | { |
| 60 | int origcount = count; | 60 | int origcount = count; |
| @@ -119,7 +119,7 @@ static int pvc_proc_read_scroll(char *page, char **start, | |||
| 119 | page += sprintf(page, "%d\n", scroll_dir * scroll_interval); | 119 | page += sprintf(page, "%d\n", scroll_dir * scroll_interval); |
| 120 | up(&pvc_sem); | 120 | up(&pvc_sem); |
| 121 | 121 | ||
| 122 | return page - origpage; | 122 | return page - origpage; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | 125 | ||
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c index ca62881c9e52..88c7ab871ec4 100644 --- a/arch/mips/lasat/prom.c +++ b/arch/mips/lasat/prom.c | |||
| @@ -42,7 +42,7 @@ static void null_prom_putc(char c) | |||
| 42 | /* these are functions provided by the bootloader */ | 42 | /* these are functions provided by the bootloader */ |
| 43 | static void (* prom_putc)(char c) = null_prom_putc; | 43 | static void (* prom_putc)(char c) = null_prom_putc; |
| 44 | void (* prom_printf)(const char * fmt, ...) = null_prom_printf; | 44 | void (* prom_printf)(const char * fmt, ...) = null_prom_printf; |
| 45 | void (* prom_display)(const char *string, int pos, int clear) = | 45 | void (* prom_display)(const char *string, int pos, int clear) = |
| 46 | null_prom_display; | 46 | null_prom_display; |
| 47 | void (* prom_monitor)(void) = null_prom_monitor; | 47 | void (* prom_monitor)(void) = null_prom_monitor; |
| 48 | 48 | ||
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c index 37e4912ee1c8..8d7d7a454f9a 100644 --- a/arch/mips/lasat/reset.c +++ b/arch/mips/lasat/reset.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Thomas Horsten <thh@lasat.com> | 2 | * Thomas Horsten <thh@lasat.com> |
| 3 | * Copyright (C) 2000 LASAT Networks A/S. | 3 | * Copyright (C) 2000 LASAT Networks A/S. |
| 4 | * | 4 | * |
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index e371ed5cbe34..f2604fab9a99 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
| @@ -105,7 +105,7 @@ static int lasat_panic_prom_monitor(struct notifier_block *this, | |||
| 105 | return NOTIFY_DONE; | 105 | return NOTIFY_DONE; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | static struct notifier_block lasat_panic_block[] = | 108 | static struct notifier_block lasat_panic_block[] = |
| 109 | { | 109 | { |
| 110 | { lasat_panic_display, NULL, INT_MAX }, | 110 | { lasat_panic_display, NULL, INT_MAX }, |
| 111 | { lasat_panic_prom_monitor, NULL, INT_MIN } | 111 | { lasat_panic_prom_monitor, NULL, INT_MIN } |
| @@ -120,7 +120,7 @@ static void lasat_timer_setup(struct irqaction *irq) | |||
| 120 | { | 120 | { |
| 121 | 121 | ||
| 122 | write_c0_compare( | 122 | write_c0_compare( |
| 123 | read_c0_count() + | 123 | read_c0_count() + |
| 124 | mips_hpt_frequency / HZ); | 124 | mips_hpt_frequency / HZ); |
| 125 | change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); | 125 | change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); |
| 126 | } | 126 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 1c0cc620a43f..8ff43a1c1e99 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -37,14 +37,14 @@ | |||
| 37 | 37 | ||
| 38 | static DECLARE_MUTEX(lasat_info_sem); | 38 | static DECLARE_MUTEX(lasat_info_sem); |
| 39 | 39 | ||
| 40 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
| 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
| 42 | void *oldval, size_t *oldlenp, | 42 | void *oldval, size_t *oldlenp, |
| 43 | void *newval, size_t newlen, void **context) | 43 | void *newval, size_t newlen, void **context) |
| 44 | { | 44 | { |
| 45 | int r; | 45 | int r; |
| 46 | down(&lasat_info_sem); | 46 | down(&lasat_info_sem); |
| 47 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
| 48 | nlen, oldval, oldlenp, newval, newlen, context); | 48 | nlen, oldval, oldlenp, newval, newlen, context); |
| 49 | if (r < 0) { | 49 | if (r < 0) { |
| 50 | up(&lasat_info_sem); | 50 | up(&lasat_info_sem); |
| @@ -74,7 +74,7 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
| 74 | return 0; | 74 | return 0; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | /* proc function to write EEPROM after changing int entry */ | 77 | /* proc function to write EEPROM after changing int entry */ |
| 78 | int proc_dolasatint(ctl_table *table, int write, struct file *filp, | 78 | int proc_dolasatint(ctl_table *table, int write, struct file *filp, |
| 79 | void *buffer, size_t *lenp, loff_t *ppos) | 79 | void *buffer, size_t *lenp, loff_t *ppos) |
| 80 | { | 80 | { |
| @@ -93,7 +93,7 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
| 93 | static int rtctmp; | 93 | static int rtctmp; |
| 94 | 94 | ||
| 95 | #ifdef CONFIG_DS1603 | 95 | #ifdef CONFIG_DS1603 |
| 96 | /* proc function to read/write RealTime Clock */ | 96 | /* proc function to read/write RealTime Clock */ |
| 97 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 97 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
| 98 | void *buffer, size_t *lenp, loff_t *ppos) | 98 | void *buffer, size_t *lenp, loff_t *ppos) |
| 99 | { | 99 | { |
| @@ -165,9 +165,9 @@ static char lasat_bcastaddr[16]; | |||
| 165 | void update_bcastaddr(void) | 165 | void update_bcastaddr(void) |
| 166 | { | 166 | { |
| 167 | unsigned int ip; | 167 | unsigned int ip; |
| 168 | 168 | ||
| 169 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | 169 | ip = (lasat_board_info.li_eeprom_info.ipaddr & |
| 170 | lasat_board_info.li_eeprom_info.netmask) | | 170 | lasat_board_info.li_eeprom_info.netmask) | |
| 171 | ~lasat_board_info.li_eeprom_info.netmask; | 171 | ~lasat_board_info.li_eeprom_info.netmask; |
| 172 | 172 | ||
| 173 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | 173 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", |
| @@ -205,7 +205,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
| 205 | break; | 205 | break; |
| 206 | len++; | 206 | len++; |
| 207 | } | 207 | } |
| 208 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 208 | if (len >= sizeof(proc_lasat_ipbuf)-1) |
| 209 | len = sizeof(proc_lasat_ipbuf) - 1; | 209 | len = sizeof(proc_lasat_ipbuf) - 1; |
| 210 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) | 210 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) |
| 211 | { | 211 | { |
| @@ -249,8 +249,8 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
| 249 | } | 249 | } |
| 250 | #endif /* defined(CONFIG_INET) */ | 250 | #endif /* defined(CONFIG_INET) */ |
| 251 | 251 | ||
| 252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, |
| 253 | void *oldval, size_t *oldlenp, | 253 | void *oldval, size_t *oldlenp, |
| 254 | void *newval, size_t newlen, | 254 | void *newval, size_t newlen, |
| 255 | void **context) | 255 | void **context) |
| 256 | { | 256 | { |
| @@ -293,7 +293,7 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | |||
| 293 | if (!strcmp(filp->f_dentry->d_name.name, "debugaccess")) | 293 | if (!strcmp(filp->f_dentry->d_name.name, "debugaccess")) |
| 294 | lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; | 294 | lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; |
| 295 | } | 295 | } |
| 296 | lasat_write_eeprom_info(); | 296 | lasat_write_eeprom_info(); |
| 297 | up(&lasat_info_sem); | 297 | up(&lasat_info_sem); |
| 298 | return 0; | 298 | return 0; |
| 299 | } | 299 | } |
| @@ -316,8 +316,8 @@ static ctl_table lasat_table[] = { | |||
| 316 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, | 316 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, |
| 317 | {LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int), | 317 | {LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int), |
| 318 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, | 318 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, |
| 319 | {LASAT_BCAST, "bcastaddr", &lasat_bcastaddr, | 319 | {LASAT_BCAST, "bcastaddr", &lasat_bcastaddr, |
| 320 | sizeof(lasat_bcastaddr), 0600, NULL, | 320 | sizeof(lasat_bcastaddr), 0600, NULL, |
| 321 | &proc_dostring, &sysctl_string}, | 321 | &proc_dostring, &sysctl_string}, |
| 322 | #endif | 322 | #endif |
| 323 | {LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash), | 323 | {LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash), |
