diff options
author | Adam Buchbinder <adam.buchbinder@gmail.com> | 2012-09-19 21:48:00 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-11-19 08:31:35 -0500 |
commit | 48fc7f7e787dd65ffe88521bce31f4062ba273eb (patch) | |
tree | 0ee37107cf965a6b2d6d85ed3686ef1d6a622bef | |
parent | 53f698cdeb0e1af2799a515b578a779943c43482 (diff) |
Fix misspellings of "whether" in comments.
"Whether" is misspelled in various comments across the tree; this
fixes them. No code changes.
Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
45 files changed, 58 insertions, 58 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/bast-map.h b/arch/arm/mach-s3c24xx/include/mach/bast-map.h index 6e7dc9d0cf0e..eecea2a50f8f 100644 --- a/arch/arm/mach-s3c24xx/include/mach/bast-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/bast-map.h | |||
@@ -74,7 +74,7 @@ | |||
74 | 74 | ||
75 | 75 | ||
76 | /* 0xE0000000 contains the IO space that is split by speed and | 76 | /* 0xE0000000 contains the IO space that is split by speed and |
77 | * wether the access is for 8 or 16bit IO... this ensures that | 77 | * whether the access is for 8 or 16bit IO... this ensures that |
78 | * the correct access is made | 78 | * the correct access is made |
79 | * | 79 | * |
80 | * 0x10000000 of space, partitioned as so: | 80 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h index ee99fd56c043..6b72d5a4b377 100644 --- a/arch/arm/mach-s3c24xx/include/mach/dma.h +++ b/arch/arm/mach-s3c24xx/include/mach/dma.h | |||
@@ -88,7 +88,7 @@ enum s3c2410_dma_state { | |||
88 | * | 88 | * |
89 | * This represents the state of the DMA engine, wrt to the loaded / running | 89 | * This represents the state of the DMA engine, wrt to the loaded / running |
90 | * transfers. Since we don't have any way of knowing exactly the state of | 90 | * transfers. Since we don't have any way of knowing exactly the state of |
91 | * the DMA transfers, we need to know the state to make decisions on wether | 91 | * the DMA transfers, we need to know the state to make decisions on whether |
92 | * we can | 92 | * we can |
93 | * | 93 | * |
94 | * S3C2410_DMA_NONE | 94 | * S3C2410_DMA_NONE |
diff --git a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h index 99612fcc4eb2..28376e56dd3b 100644 --- a/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h +++ b/arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | |||
@@ -51,7 +51,7 @@ | |||
51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) | 51 | #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) |
52 | 52 | ||
53 | /* 0xE0000000 contains the IO space that is split by speed and | 53 | /* 0xE0000000 contains the IO space that is split by speed and |
54 | * wether the access is for 8 or 16bit IO... this ensures that | 54 | * whether the access is for 8 or 16bit IO... this ensures that |
55 | * the correct access is made | 55 | * the correct access is made |
56 | * | 56 | * |
57 | * 0x10000000 of space, partitioned as so: | 57 | * 0x10000000 of space, partitioned as so: |
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c index 60627e63a254..724755f0b0f5 100644 --- a/arch/arm/mach-s3c24xx/pm.c +++ b/arch/arm/mach-s3c24xx/pm.c | |||
@@ -121,7 +121,7 @@ void s3c_pm_configure_extint(void) | |||
121 | int pin; | 121 | int pin; |
122 | 122 | ||
123 | /* for each of the external interrupts (EINT0..EINT15) we | 123 | /* for each of the external interrupts (EINT0..EINT15) we |
124 | * need to check wether it is an external interrupt source, | 124 | * need to check whether it is an external interrupt source, |
125 | * and then configure it as an input if it is not | 125 | * and then configure it as an input if it is not |
126 | */ | 126 | */ |
127 | 127 | ||
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index db98e7021f0d..3eb5139656af 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -325,7 +325,7 @@ static int s3c2410_dma_start(struct s3c2410_dma_chan *chan) | |||
325 | 325 | ||
326 | chan->state = S3C2410_DMA_RUNNING; | 326 | chan->state = S3C2410_DMA_RUNNING; |
327 | 327 | ||
328 | /* check wether there is anything to load, and if not, see | 328 | /* check whether there is anything to load, and if not, see |
329 | * if we can find anything to load | 329 | * if we can find anything to load |
330 | */ | 330 | */ |
331 | 331 | ||
diff --git a/arch/m68k/math-emu/fp_log.c b/arch/m68k/math-emu/fp_log.c index 3384a5244fbd..0663067870f2 100644 --- a/arch/m68k/math-emu/fp_log.c +++ b/arch/m68k/math-emu/fp_log.c | |||
@@ -50,7 +50,7 @@ fp_fsqrt(struct fp_ext *dest, struct fp_ext *src) | |||
50 | * sqrt(m*2^e) = | 50 | * sqrt(m*2^e) = |
51 | * sqrt(2*m) * 2^(p) , if e = 2*p + 1 | 51 | * sqrt(2*m) * 2^(p) , if e = 2*p + 1 |
52 | * | 52 | * |
53 | * So we use the last bit of the exponent to decide wether to | 53 | * So we use the last bit of the exponent to decide whether to |
54 | * use the m or 2*m. | 54 | * use the m or 2*m. |
55 | * | 55 | * |
56 | * Since only the fractional part of the mantissa is stored and | 56 | * Since only the fractional part of the mantissa is stored and |
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h index eedf427c9124..3e13e23e4fdf 100644 --- a/arch/powerpc/include/asm/pte-hash64-64k.h +++ b/arch/powerpc/include/asm/pte-hash64-64k.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | /* Note the full page bits must be in the same location as for normal | 24 | /* Note the full page bits must be in the same location as for normal |
25 | * 4k pages as the same assembly will be used to insert 64K pages | 25 | * 4k pages as the same assembly will be used to insert 64K pages |
26 | * wether the kernel has CONFIG_PPC_64K_PAGES or not | 26 | * whether the kernel has CONFIG_PPC_64K_PAGES or not |
27 | */ | 27 | */ |
28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ | 28 | #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ |
29 | #define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ | 29 | #define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ |
diff --git a/arch/powerpc/include/asm/smu.h b/arch/powerpc/include/asm/smu.h index ae20ce1af4c7..6e909f3e6a46 100644 --- a/arch/powerpc/include/asm/smu.h +++ b/arch/powerpc/include/asm/smu.h | |||
@@ -132,7 +132,7 @@ | |||
132 | * | 132 | * |
133 | * At this point, the OF driver seems to have a limitation on transfer | 133 | * At this point, the OF driver seems to have a limitation on transfer |
134 | * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know | 134 | * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know |
135 | * wether this is just an OF limit due to some temporary buffer size | 135 | * whether this is just an OF limit due to some temporary buffer size |
136 | * or if this is an SMU imposed limit. This driver has the same limitation | 136 | * or if this is an SMU imposed limit. This driver has the same limitation |
137 | * for now as I use a 0x10 bytes temporary buffer as well | 137 | * for now as I use a 0x10 bytes temporary buffer as well |
138 | * | 138 | * |
@@ -236,7 +236,7 @@ | |||
236 | * 3 (optional): enable nmi? [0x00 or 0x01] | 236 | * 3 (optional): enable nmi? [0x00 or 0x01] |
237 | * | 237 | * |
238 | * Returns: | 238 | * Returns: |
239 | * If parameter 2 is 0x00 and parameter 3 is not specified, returns wether | 239 | * If parameter 2 is 0x00 and parameter 3 is not specified, returns whether |
240 | * NMI is enabled. Otherwise unknown. | 240 | * NMI is enabled. Otherwise unknown. |
241 | */ | 241 | */ |
242 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 | 242 | #define SMU_CMD_MISC_df_NMI_OPTION 0x04 |
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index bedd12e1cfbc..0733b05eb856 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
@@ -387,7 +387,7 @@ void __init find_legacy_serial_ports(void) | |||
387 | of_node_put(parent); | 387 | of_node_put(parent); |
388 | continue; | 388 | continue; |
389 | } | 389 | } |
390 | /* Check for known pciclass, and also check wether we have | 390 | /* Check for known pciclass, and also check whether we have |
391 | * a device with child nodes for ports or not | 391 | * a device with child nodes for ports or not |
392 | */ | 392 | */ |
393 | if (of_device_is_compatible(np, "pciclass,0700") || | 393 | if (of_device_is_compatible(np, "pciclass,0700") || |
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 2049f2d00ffe..9db8ec07ec94 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -82,7 +82,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev) | |||
82 | return -ENXIO; | 82 | return -ENXIO; |
83 | 83 | ||
84 | /* Claim resources. This might need some rework as well depending | 84 | /* Claim resources. This might need some rework as well depending |
85 | * wether we are doing probe-only or not, like assigning unassigned | 85 | * whether we are doing probe-only or not, like assigning unassigned |
86 | * resources etc... | 86 | * resources etc... |
87 | */ | 87 | */ |
88 | pcibios_claim_one_bus(phb->bus); | 88 | pcibios_claim_one_bus(phb->bus); |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index d183f8719a50..1ca045d44324 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -83,7 +83,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
83 | * the context). This is very important because we must ensure we | 83 | * the context). This is very important because we must ensure we |
84 | * don't lose the VRSAVE content that may have been set prior to | 84 | * don't lose the VRSAVE content that may have been set prior to |
85 | * the process doing its first vector operation | 85 | * the process doing its first vector operation |
86 | * Userland shall check AT_HWCAP to know wether it can rely on the | 86 | * Userland shall check AT_HWCAP to know whether it can rely on the |
87 | * v_regs pointer or not | 87 | * v_regs pointer or not |
88 | */ | 88 | */ |
89 | #ifdef CONFIG_ALTIVEC | 89 | #ifdef CONFIG_ALTIVEC |
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 5829d2a950d4..cf9dada734b6 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c | |||
@@ -722,7 +722,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start, | |||
722 | } | 722 | } |
723 | 723 | ||
724 | /* | 724 | /* |
725 | * is_hugepage_only_range() is used by generic code to verify wether | 725 | * is_hugepage_only_range() is used by generic code to verify whether |
726 | * a normal mmap mapping (non hugetlbfs) is valid on a given area. | 726 | * a normal mmap mapping (non hugetlbfs) is valid on a given area. |
727 | * | 727 | * |
728 | * until the generic code provides a more generic hook and/or starts | 728 | * until the generic code provides a more generic hook and/or starts |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index 028470b95886..a51cb07bd663 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c | |||
@@ -526,7 +526,7 @@ EXPORT_SYMBOL(mpc52xx_gpt_timer_period); | |||
526 | 526 | ||
527 | #define WDT_IDENTITY "mpc52xx watchdog on GPT0" | 527 | #define WDT_IDENTITY "mpc52xx watchdog on GPT0" |
528 | 528 | ||
529 | /* wdt_is_active stores wether or not the /dev/watchdog device is opened */ | 529 | /* wdt_is_active stores whether or not the /dev/watchdog device is opened */ |
530 | static unsigned long wdt_is_active; | 530 | static unsigned long wdt_is_active; |
531 | 531 | ||
532 | /* wdt-capable gpt */ | 532 | /* wdt-capable gpt */ |
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index dca213666747..e56bb651da1a 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -728,7 +728,7 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np) | |||
728 | nid, np->full_name); | 728 | nid, np->full_name); |
729 | 729 | ||
730 | /* XXX todo: If we can have multiple windows on the same IOMMU, which | 730 | /* XXX todo: If we can have multiple windows on the same IOMMU, which |
731 | * isn't the case today, we probably want here to check wether the | 731 | * isn't the case today, we probably want here to check whether the |
732 | * iommu for that node is already setup. | 732 | * iommu for that node is already setup. |
733 | * However, there might be issue with getting the size right so let's | 733 | * However, there might be issue with getting the size right so let's |
734 | * ignore that for now. We might want to completely get rid of the | 734 | * ignore that for now. We might want to completely get rid of the |
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index d8b7cc8a66ca..8e299447127e 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c | |||
@@ -148,7 +148,7 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type) | |||
148 | 148 | ||
149 | /* Configure the source. One gross hack that was there before and | 149 | /* Configure the source. One gross hack that was there before and |
150 | * that I've kept around is the priority to the BE which I set to | 150 | * that I've kept around is the priority to the BE which I set to |
151 | * be the same as the interrupt source number. I don't know wether | 151 | * be the same as the interrupt source number. I don't know whether |
152 | * that's supposed to make any kind of sense however, we'll have to | 152 | * that's supposed to make any kind of sense however, we'll have to |
153 | * decide that, but for now, I'm not changing the behaviour. | 153 | * decide that, but for now, I'm not changing the behaviour. |
154 | */ | 154 | */ |
@@ -220,7 +220,7 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc) | |||
220 | /* For hooking up the cascace we have a problem. Our device-tree is | 220 | /* For hooking up the cascace we have a problem. Our device-tree is |
221 | * crap and we don't know on which BE iic interrupt we are hooked on at | 221 | * crap and we don't know on which BE iic interrupt we are hooked on at |
222 | * least not the "standard" way. We can reconstitute it based on two | 222 | * least not the "standard" way. We can reconstitute it based on two |
223 | * informations though: which BE node we are connected to and wether | 223 | * informations though: which BE node we are connected to and whether |
224 | * we are connected to IOIF0 or IOIF1. Right now, we really only care | 224 | * we are connected to IOIF0 or IOIF1. Right now, we really only care |
225 | * about the IBM cell blade and we know that its firmware gives us an | 225 | * about the IBM cell blade and we know that its firmware gives us an |
226 | * interrupt-map property which is pretty strange. | 226 | * interrupt-map property which is pretty strange. |
@@ -232,7 +232,7 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) | |||
232 | int imaplen, intsize, unit; | 232 | int imaplen, intsize, unit; |
233 | struct device_node *iic; | 233 | struct device_node *iic; |
234 | 234 | ||
235 | /* First, we check wether we have a real "interrupts" in the device | 235 | /* First, we check whether we have a real "interrupts" in the device |
236 | * tree in case the device-tree is ever fixed | 236 | * tree in case the device-tree is ever fixed |
237 | */ | 237 | */ |
238 | struct of_irq oirq; | 238 | struct of_irq oirq; |
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index c4e630576ff2..31036b56670e 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c | |||
@@ -529,7 +529,7 @@ static int __init pmac_pic_probe_mpic(void) | |||
529 | void __init pmac_pic_init(void) | 529 | void __init pmac_pic_init(void) |
530 | { | 530 | { |
531 | /* We configure the OF parsing based on our oldworld vs. newworld | 531 | /* We configure the OF parsing based on our oldworld vs. newworld |
532 | * platform type and wether we were booted by BootX. | 532 | * platform type and whether we were booted by BootX. |
533 | */ | 533 | */ |
534 | #ifdef CONFIG_PPC32 | 534 | #ifdef CONFIG_PPC32 |
535 | if (!pmac_newworld) | 535 | if (!pmac_newworld) |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 14313ad43b76..42509492717e 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1648,7 +1648,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev) | |||
1648 | ring->wptr = 0; | 1648 | ring->wptr = 0; |
1649 | WREG32(CP_RB_WPTR, ring->wptr); | 1649 | WREG32(CP_RB_WPTR, ring->wptr); |
1650 | 1650 | ||
1651 | /* set the wb address wether it's enabled or not */ | 1651 | /* set the wb address whether it's enabled or not */ |
1652 | WREG32(CP_RB_RPTR_ADDR, | 1652 | WREG32(CP_RB_RPTR_ADDR, |
1653 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); | 1653 | ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); |
1654 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 1654 | WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 81e6a568c29d..cda01f808f12 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1059,7 +1059,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1059 | 1059 | ||
1060 | WREG32(CP_DEBUG, (1 << 27)); | 1060 | WREG32(CP_DEBUG, (1 << 27)); |
1061 | 1061 | ||
1062 | /* set the wb address wether it's enabled or not */ | 1062 | /* set the wb address whether it's enabled or not */ |
1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); | 1063 | WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); |
1064 | WREG32(SCRATCH_UMSK, 0xff); | 1064 | WREG32(SCRATCH_UMSK, 0xff); |
1065 | 1065 | ||
@@ -1076,7 +1076,7 @@ static int cayman_cp_resume(struct radeon_device *rdev) | |||
1076 | #endif | 1076 | #endif |
1077 | WREG32(cp_rb_cntl[i], rb_cntl); | 1077 | WREG32(cp_rb_cntl[i], rb_cntl); |
1078 | 1078 | ||
1079 | /* set the wb address wether it's enabled or not */ | 1079 | /* set the wb address whether it's enabled or not */ |
1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; | 1080 | addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; |
1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); | 1081 | WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); |
1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); | 1082 | WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index b0db712060fb..ea4691f79ccd 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -2007,7 +2007,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2007 | ring->wptr = 0; | 2007 | ring->wptr = 0; |
2008 | WREG32(CP_RB0_WPTR, ring->wptr); | 2008 | WREG32(CP_RB0_WPTR, ring->wptr); |
2009 | 2009 | ||
2010 | /* set the wb address wether it's enabled or not */ | 2010 | /* set the wb address whether it's enabled or not */ |
2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); | 2011 | WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); |
2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); | 2012 | WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); |
2013 | 2013 | ||
@@ -2040,7 +2040,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2040 | ring->wptr = 0; | 2040 | ring->wptr = 0; |
2041 | WREG32(CP_RB1_WPTR, ring->wptr); | 2041 | WREG32(CP_RB1_WPTR, ring->wptr); |
2042 | 2042 | ||
2043 | /* set the wb address wether it's enabled or not */ | 2043 | /* set the wb address whether it's enabled or not */ |
2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); | 2044 | WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); |
2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); | 2045 | WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); |
2046 | 2046 | ||
@@ -2066,7 +2066,7 @@ static int si_cp_resume(struct radeon_device *rdev) | |||
2066 | ring->wptr = 0; | 2066 | ring->wptr = 0; |
2067 | WREG32(CP_RB2_WPTR, ring->wptr); | 2067 | WREG32(CP_RB2_WPTR, ring->wptr); |
2068 | 2068 | ||
2069 | /* set the wb address wether it's enabled or not */ | 2069 | /* set the wb address whether it's enabled or not */ |
2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); | 2070 | WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); |
2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); | 2071 | WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); |
2072 | 2072 | ||
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c index f41502ef3f55..a23b91b0b738 100644 --- a/drivers/i2c/busses/i2c-nuc900.c +++ b/drivers/i2c/busses/i2c-nuc900.c | |||
@@ -304,7 +304,7 @@ retry_write: | |||
304 | 304 | ||
305 | case STATE_READ: | 305 | case STATE_READ: |
306 | /* we have a byte of data in the data register, do | 306 | /* we have a byte of data in the data register, do |
307 | * something with it, and then work out wether we are | 307 | * something with it, and then work out whether we are |
308 | * going to do any more read/write | 308 | * going to do any more read/write |
309 | */ | 309 | */ |
310 | 310 | ||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 3e0335f1fc60..de9e1fa0aa0e 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -208,7 +208,7 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, | |||
208 | if (msg->flags & I2C_M_REV_DIR_ADDR) | 208 | if (msg->flags & I2C_M_REV_DIR_ADDR) |
209 | addr ^= 1; | 209 | addr ^= 1; |
210 | 210 | ||
211 | /* todo - check for wether ack wanted or not */ | 211 | /* todo - check for whether ack wanted or not */ |
212 | s3c24xx_i2c_enable_ack(i2c); | 212 | s3c24xx_i2c_enable_ack(i2c); |
213 | 213 | ||
214 | iiccon = readl(i2c->regs + S3C2410_IICCON); | 214 | iiccon = readl(i2c->regs + S3C2410_IICCON); |
@@ -397,7 +397,7 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
397 | 397 | ||
398 | case STATE_READ: | 398 | case STATE_READ: |
399 | /* we have a byte of data in the data register, do | 399 | /* we have a byte of data in the data register, do |
400 | * something with it, and then work out wether we are | 400 | * something with it, and then work out whether we are |
401 | * going to do any more read/write | 401 | * going to do any more read/write |
402 | */ | 402 | */ |
403 | 403 | ||
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c index 891558de3ec1..2de66b062f0d 100644 --- a/drivers/mtd/maps/plat-ram.c +++ b/drivers/mtd/maps/plat-ram.c | |||
@@ -219,7 +219,7 @@ static int platram_probe(struct platform_device *pdev) | |||
219 | 219 | ||
220 | platram_setrw(info, PLATRAM_RW); | 220 | platram_setrw(info, PLATRAM_RW); |
221 | 221 | ||
222 | /* check to see if there are any available partitions, or wether | 222 | /* check to see if there are any available partitions, or whether |
223 | * to add this device whole */ | 223 | * to add this device whole */ |
224 | 224 | ||
225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, | 225 | err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, |
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 295e4bedad96..79ded48e7427 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
@@ -879,7 +879,7 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info, | |||
879 | if (chip->ecc.mode != NAND_ECC_HW) | 879 | if (chip->ecc.mode != NAND_ECC_HW) |
880 | return; | 880 | return; |
881 | 881 | ||
882 | /* change the behaviour depending on wether we are using | 882 | /* change the behaviour depending on whether we are using |
883 | * the large or small page nand device */ | 883 | * the large or small page nand device */ |
884 | 884 | ||
885 | if (chip->page_shift > 10) { | 885 | if (chip->page_shift > 10) { |
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 203ff9dccadb..846381c31185 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c | |||
@@ -109,7 +109,7 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev) | |||
109 | /* | 109 | /* |
110 | * ax_initial_check | 110 | * ax_initial_check |
111 | * | 111 | * |
112 | * do an initial probe for the card to check wether it exists | 112 | * do an initial probe for the card to check whether it exists |
113 | * and is functional | 113 | * and is functional |
114 | */ | 114 | */ |
115 | static int ax_initial_check(struct net_device *dev) | 115 | static int ax_initial_check(struct net_device *dev) |
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h index 7ec4b864a550..75ec5e7cf50d 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h | |||
@@ -27,7 +27,7 @@ struct mcp_gen_header { | |||
27 | * | 27 | * |
28 | * Fields below this comment are extensions added in later versions | 28 | * Fields below this comment are extensions added in later versions |
29 | * of this struct, drivers should compare the header_length against | 29 | * of this struct, drivers should compare the header_length against |
30 | * offsetof(field) to check wether a given MCP implements them. | 30 | * offsetof(field) to check whether a given MCP implements them. |
31 | * | 31 | * |
32 | * Never remove any field. Keep everything naturally align. | 32 | * Never remove any field. Keep everything naturally align. |
33 | */ | 33 | */ |
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 58f13adaa549..ae7cd7f3656d 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
@@ -608,7 +608,7 @@ static int bcm5421_poll_link(struct mii_phy* phy) | |||
608 | if ( mode == BCM54XX_COPPER) | 608 | if ( mode == BCM54XX_COPPER) |
609 | return genmii_poll_link(phy); | 609 | return genmii_poll_link(phy); |
610 | 610 | ||
611 | /* try to find out wether we have a link */ | 611 | /* try to find out whether we have a link */ |
612 | phy_write(phy, MII_NCONFIG, 0x2000); | 612 | phy_write(phy, MII_NCONFIG, 0x2000); |
613 | phy_reg = phy_read(phy, MII_NCONFIG); | 613 | phy_reg = phy_read(phy, MII_NCONFIG); |
614 | 614 | ||
@@ -634,7 +634,7 @@ static int bcm5421_read_link(struct mii_phy* phy) | |||
634 | 634 | ||
635 | phy->speed = SPEED_1000; | 635 | phy->speed = SPEED_1000; |
636 | 636 | ||
637 | /* find out wether we are running half- or full duplex */ | 637 | /* find out whether we are running half- or full duplex */ |
638 | phy_write(phy, MII_NCONFIG, 0x2000); | 638 | phy_write(phy, MII_NCONFIG, 0x2000); |
639 | phy_reg = phy_read(phy, MII_NCONFIG); | 639 | phy_reg = phy_read(phy, MII_NCONFIG); |
640 | 640 | ||
@@ -681,7 +681,7 @@ static int bcm5461_poll_link(struct mii_phy* phy) | |||
681 | if ( mode == BCM54XX_COPPER) | 681 | if ( mode == BCM54XX_COPPER) |
682 | return genmii_poll_link(phy); | 682 | return genmii_poll_link(phy); |
683 | 683 | ||
684 | /* find out wether we have a link */ | 684 | /* find out whether we have a link */ |
685 | phy_write(phy, MII_NCONFIG, 0x7000); | 685 | phy_write(phy, MII_NCONFIG, 0x7000); |
686 | phy_reg = phy_read(phy, MII_NCONFIG); | 686 | phy_reg = phy_read(phy, MII_NCONFIG); |
687 | 687 | ||
@@ -710,7 +710,7 @@ static int bcm5461_read_link(struct mii_phy* phy) | |||
710 | 710 | ||
711 | phy->speed = SPEED_1000; | 711 | phy->speed = SPEED_1000; |
712 | 712 | ||
713 | /* find out wether we are running half- or full duplex */ | 713 | /* find out whether we are running half- or full duplex */ |
714 | phy_write(phy, MII_NCONFIG, 0x7000); | 714 | phy_write(phy, MII_NCONFIG, 0x7000); |
715 | phy_reg = phy_read(phy, MII_NCONFIG); | 715 | phy_reg = phy_read(phy, MII_NCONFIG); |
716 | 716 | ||
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index 26c81f233606..afb7cfa85ccc 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c | |||
@@ -118,7 +118,7 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], | |||
118 | return ret; | 118 | return ret; |
119 | } | 119 | } |
120 | 120 | ||
121 | /* simple check to see wether we have a isl1208 */ | 121 | /* simple check to see whether we have a isl1208 */ |
122 | static int | 122 | static int |
123 | isl1208_i2c_validate_client(struct i2c_client *client) | 123 | isl1208_i2c_validate_client(struct i2c_client *client) |
124 | { | 124 | { |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 77823d21d314..a7a2a998fa91 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -186,7 +186,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) | |||
186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); | 186 | rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); |
187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); | 187 | rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); |
188 | 188 | ||
189 | /* the only way to work out wether the system was mid-update | 189 | /* the only way to work out whether the system was mid-update |
190 | * when we read it is to check the second counter, and if it | 190 | * when we read it is to check the second counter, and if it |
191 | * is zero, then we re-try the entire read | 191 | * is zero, then we re-try the entire read |
192 | */ | 192 | */ |
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index b2b8c18eeced..20cfd028edcf 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
@@ -1344,7 +1344,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature) | |||
1344 | 1344 | ||
1345 | /* | 1345 | /* |
1346 | * Set / reset given feature. | 1346 | * Set / reset given feature. |
1347 | * Flag indicates wether to set (!=0) or the reset (=0) the feature. | 1347 | * Flag indicates whether to set (!=0) or the reset (=0) the feature. |
1348 | */ | 1348 | */ |
1349 | int | 1349 | int |
1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) | 1350 | dasd_set_feature(struct ccw_device *cdev, int feature, int flag) |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index d36446dd7ae8..73c93cf364c8 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -883,7 +883,7 @@ static void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) | |||
883 | } else { | 883 | } else { |
884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); | 884 | US_DEBUGP("%s: NOT working scsi, not SS\n", __func__); |
885 | chip->proto_handler_backup(srb, us); | 885 | chip->proto_handler_backup(srb, us); |
886 | /* Check wether card is plugged in */ | 886 | /* Check whether card is plugged in */ |
887 | if (srb->cmnd[0] == TEST_UNIT_READY) { | 887 | if (srb->cmnd[0] == TEST_UNIT_READY) { |
888 | if (srb->result == SAM_STAT_GOOD) { | 888 | if (srb->result == SAM_STAT_GOOD) { |
889 | SET_LUN_READY(chip, srb->device->lun); | 889 | SET_LUN_READY(chip, srb->device->lun); |
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 5b06d31ab6a9..c0bc92d8e438 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -212,7 +212,7 @@ static long booke_wdt_ioctl(struct file *file, | |||
212 | return 0; | 212 | return 0; |
213 | } | 213 | } |
214 | 214 | ||
215 | /* wdt_is_active stores wether or not the /dev/watchdog device is opened */ | 215 | /* wdt_is_active stores whether or not the /dev/watchdog device is opened */ |
216 | static unsigned long wdt_is_active; | 216 | static unsigned long wdt_is_active; |
217 | 217 | ||
218 | static int booke_wdt_open(struct inode *inode, struct file *file) | 218 | static int booke_wdt_open(struct inode *inode, struct file *file) |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3d3e2c17d8d1..06b2635073f3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3888,7 +3888,7 @@ static int flush_space(struct btrfs_root *root, | |||
3888 | * @root - the root we're allocating for | 3888 | * @root - the root we're allocating for |
3889 | * @block_rsv - the block_rsv we're allocating for | 3889 | * @block_rsv - the block_rsv we're allocating for |
3890 | * @orig_bytes - the number of bytes we want | 3890 | * @orig_bytes - the number of bytes we want |
3891 | * @flush - wether or not we can flush to make our reservation | 3891 | * @flush - whether or not we can flush to make our reservation |
3892 | * | 3892 | * |
3893 | * This will reserve orgi_bytes number of bytes from the space info associated | 3893 | * This will reserve orgi_bytes number of bytes from the space info associated |
3894 | * with the block_rsv. If there is not enough space it will make an attempt to | 3894 | * with the block_rsv. If there is not enough space it will make an attempt to |
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index dd27a0b46a37..853fc7beedfa 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -76,7 +76,7 @@ struct btrfs_ordered_sum { | |||
76 | 76 | ||
77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ | 77 | #define BTRFS_ORDERED_IOERR 6 /* We had an io error when writing this out */ |
78 | 78 | ||
79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates wether this ordered extent | 79 | #define BTRFS_ORDERED_UPDATED_ISIZE 7 /* indicates whether this ordered extent |
80 | * has done its due diligence in updating | 80 | * has done its due diligence in updating |
81 | * the isize. */ | 81 | * the isize. */ |
82 | 82 | ||
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3c20de1d59d0..df163da388c9 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -2455,7 +2455,7 @@ TAS_BUFFER_FNS(Uninit, uninit) | |||
2455 | BUFFER_FNS(Da_Mapped, da_mapped) | 2455 | BUFFER_FNS(Da_Mapped, da_mapped) |
2456 | 2456 | ||
2457 | /* | 2457 | /* |
2458 | * Add new method to test wether block and inode bitmaps are properly | 2458 | * Add new method to test whether block and inode bitmaps are properly |
2459 | * initialized. With uninit_bg reading the block from disk is not enough | 2459 | * initialized. With uninit_bg reading the block from disk is not enough |
2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap | 2460 | * to mark the bitmap uptodate. We need to also zero-out the bitmap |
2461 | */ | 2461 | */ |
diff --git a/fs/fhandle.c b/fs/fhandle.c index f775bfdd6e4a..cccdc874bb55 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c | |||
@@ -22,7 +22,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
22 | struct file_handle *handle = NULL; | 22 | struct file_handle *handle = NULL; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * We need t make sure wether the file system | 25 | * We need to make sure whether the file system |
26 | * support decoding of the file handle | 26 | * support decoding of the file handle |
27 | */ | 27 | */ |
28 | if (!path->dentry->d_sb->s_export_op || | 28 | if (!path->dentry->d_sb->s_export_op || |
@@ -40,7 +40,7 @@ static long do_sys_name_to_handle(struct path *path, | |||
40 | if (!handle) | 40 | if (!handle) |
41 | return -ENOMEM; | 41 | return -ENOMEM; |
42 | 42 | ||
43 | /* convert handle size to multiple of sizeof(u32) */ | 43 | /* convert handle size to multiple of sizeof(u32) */ |
44 | handle_dwords = f_handle.handle_bytes >> 2; | 44 | handle_dwords = f_handle.handle_bytes >> 2; |
45 | 45 | ||
46 | /* we ask for a non connected handle */ | 46 | /* we ask for a non connected handle */ |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 78b7f84241d4..8b472c8bbf7a 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1259,7 +1259,7 @@ int journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1259 | goto not_jbd; | 1259 | goto not_jbd; |
1260 | } | 1260 | } |
1261 | 1261 | ||
1262 | /* keep track of wether or not this transaction modified us */ | 1262 | /* keep track of whether or not this transaction modified us */ |
1263 | was_modified = jh->b_modified; | 1263 | was_modified = jh->b_modified; |
1264 | 1264 | ||
1265 | /* | 1265 | /* |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index a74ba4659549..d8da40e99d84 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -1261,7 +1261,7 @@ int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh) | |||
1261 | goto not_jbd; | 1261 | goto not_jbd; |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | /* keep track of wether or not this transaction modified us */ | 1264 | /* keep track of whether or not this transaction modified us */ |
1265 | was_modified = jh->b_modified; | 1265 | was_modified = jh->b_modified; |
1266 | 1266 | ||
1267 | /* | 1267 | /* |
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index adb90116d36b..af49e2d6941a 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * are being written out - and waiting for GC to make progress, naturally. | 33 | * are being written out - and waiting for GC to make progress, naturally. |
34 | * | 34 | * |
35 | * So we cannot just call iget() or some variant of it, but first have to check | 35 | * So we cannot just call iget() or some variant of it, but first have to check |
36 | * wether the inode in question might be in I_FREEING state. Therefore we | 36 | * whether the inode in question might be in I_FREEING state. Therefore we |
37 | * maintain our own per-sb list of "almost deleted" inodes and check against | 37 | * maintain our own per-sb list of "almost deleted" inodes and check against |
38 | * that list first. Normally this should be at most 1-2 entries long. | 38 | * that list first. Normally this should be at most 1-2 entries long. |
39 | * | 39 | * |
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h index 7a71ffad037c..cafc7f99e124 100644 --- a/include/linux/lru_cache.h +++ b/include/linux/lru_cache.h | |||
@@ -52,8 +52,8 @@ We replicate IO (more or less synchronously) to local and remote disk. | |||
52 | 52 | ||
53 | For crash recovery after replication node failure, | 53 | For crash recovery after replication node failure, |
54 | we need to resync all regions that have been target of in-flight WRITE IO | 54 | we need to resync all regions that have been target of in-flight WRITE IO |
55 | (in use, or "hot", regions), as we don't know wether or not those WRITEs have | 55 | (in use, or "hot", regions), as we don't know whether or not those WRITEs |
56 | made it to stable storage. | 56 | have made it to stable storage. |
57 | 57 | ||
58 | To avoid a "full resync", we need to persistently track these regions. | 58 | To avoid a "full resync", we need to persistently track these regions. |
59 | 59 | ||
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 0ee42d9acdc0..2c02f3a8d2ba 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -78,7 +78,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
78 | * This function acquires VGA resources for the given | 78 | * This function acquires VGA resources for the given |
79 | * card and mark those resources locked. If the resource requested | 79 | * card and mark those resources locked. If the resource requested |
80 | * are "normal" (and not legacy) resources, the arbiter will first check | 80 | * are "normal" (and not legacy) resources, the arbiter will first check |
81 | * wether the card is doing legacy decoding for that type of resource. If | 81 | * whether the card is doing legacy decoding for that type of resource. If |
82 | * yes, the lock is "converted" into a legacy resource lock. | 82 | * yes, the lock is "converted" into a legacy resource lock. |
83 | * The arbiter will first look for all VGA cards that might conflict | 83 | * The arbiter will first look for all VGA cards that might conflict |
84 | * and disable their IOs and/or Memory access, including VGA forwarding | 84 | * and disable their IOs and/or Memory access, including VGA forwarding |
@@ -89,7 +89,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev, | |||
89 | * This function will block if some conflicting card is already locking | 89 | * This function will block if some conflicting card is already locking |
90 | * one of the required resources (or any resource on a different bus | 90 | * one of the required resources (or any resource on a different bus |
91 | * segment, since P2P bridges don't differenciate VGA memory and IO | 91 | * segment, since P2P bridges don't differenciate VGA memory and IO |
92 | * afaik). You can indicate wether this blocking should be interruptible | 92 | * afaik). You can indicate whether this blocking should be interruptible |
93 | * by a signal (for userland interface) or not. | 93 | * by a signal (for userland interface) or not. |
94 | * Must not be called at interrupt time or in atomic context. | 94 | * Must not be called at interrupt time or in atomic context. |
95 | * If the card already owns the resources, the function succeeds. | 95 | * If the card already owns the resources, the function succeeds. |
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index b7f45d48b2de..87490ac4bd87 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h | |||
@@ -105,7 +105,7 @@ struct watchdog_device { | |||
105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 | 105 | #define WATCHDOG_NOWAYOUT_INIT_STATUS 0 |
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | /* Use the following function to check wether or not the watchdog is active */ | 108 | /* Use the following function to check whether or not the watchdog is active */ |
109 | static inline bool watchdog_active(struct watchdog_device *wdd) | 109 | static inline bool watchdog_active(struct watchdog_device *wdd) |
110 | { | 110 | { |
111 | return test_bit(WDOG_ACTIVE, &wdd->status); | 111 | return test_bit(WDOG_ACTIVE, &wdd->status); |
diff --git a/include/net/sock.h b/include/net/sock.h index c945fba4f543..a95e0756e56e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -213,7 +213,7 @@ struct cg_proto; | |||
213 | * @sk_sndbuf: size of send buffer in bytes | 213 | * @sk_sndbuf: size of send buffer in bytes |
214 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, | 214 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, |
215 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings | 215 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings |
216 | * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets | 216 | * @sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets |
217 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) | 217 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) |
218 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) | 218 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) |
219 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) | 219 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) |
diff --git a/net/can/proc.c b/net/can/proc.c index 3b6dd3180492..ae566902d2bf 100644 --- a/net/can/proc.c +++ b/net/can/proc.c | |||
@@ -397,7 +397,7 @@ static inline void can_rcvlist_sff_proc_show_one(struct seq_file *m, | |||
397 | int i; | 397 | int i; |
398 | int all_empty = 1; | 398 | int all_empty = 1; |
399 | 399 | ||
400 | /* check wether at least one list is non-empty */ | 400 | /* check whether at least one list is non-empty */ |
401 | for (i = 0; i < 0x800; i++) | 401 | for (i = 0; i < 0x800; i++) |
402 | if (!hlist_empty(&d->rx_sff[i])) { | 402 | if (!hlist_empty(&d->rx_sff[i])) { |
403 | all_empty = 0; | 403 | all_empty = 0; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 5d0e568fdea1..dc14234fea29 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2291,7 +2291,7 @@ static void snd_es1968_chip_init(struct es1968 *chip) | |||
2291 | outb(0x88, iobase+0x1f); | 2291 | outb(0x88, iobase+0x1f); |
2292 | 2292 | ||
2293 | /* it appears some maestros (dell 7500) only work if these are set, | 2293 | /* it appears some maestros (dell 7500) only work if these are set, |
2294 | regardless of wether we use the assp or not. */ | 2294 | regardless of whether we use the assp or not. */ |
2295 | 2295 | ||
2296 | outb(0, iobase + ASSP_CONTROL_B); | 2296 | outb(0, iobase + ASSP_CONTROL_B); |
2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ | 2297 | outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ |
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0f58b4b6d702..007fcecdf5cd 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
@@ -675,7 +675,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, | |||
675 | */ | 675 | */ |
676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) | 676 | int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp) |
677 | { | 677 | { |
678 | /* it depends on altsetting wether the device is big-endian or not */ | 678 | /* it depends on altsetting whether the device is big-endian or not */ |
679 | switch (chip->usb_id) { | 679 | switch (chip->usb_id) { |
680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ | 680 | case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */ |
681 | if (fp->altsetting == 2 || fp->altsetting == 3 || | 681 | if (fp->altsetting == 2 || fp->altsetting == 3 || |