aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/accounting/getdelays.c5
-rw-r--r--Documentation/dontdiff1
-rw-r--r--Documentation/ia64/aliasing-test.c1
-rw-r--r--Documentation/power/swsusp.txt2
-rw-r--r--Documentation/trace/kprobetrace.txt2
-rw-r--r--arch/powerpc/boot/.gitignore4
-rw-r--r--arch/x86/include/asm/hpet.h2
-rw-r--r--drivers/dma/at_hdmac.c8
-rw-r--r--drivers/dma/ep93xx_dma.c2
-rw-r--r--drivers/dma/fsldma.c2
-rw-r--r--drivers/dma/imx-dma.c4
-rw-r--r--drivers/dma/intel_mid_dma.c2
-rw-r--r--drivers/dma/intel_mid_dma_regs.h6
-rw-r--r--drivers/dma/ioat/hw.h4
-rw-r--r--drivers/dma/pl330.c2
-rw-r--r--drivers/dma/ppc4xx/adma.c2
-rw-r--r--drivers/dma/ste_dma40_ll.h2
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
-rw-r--r--drivers/mfd/rc5t583.c2
-rw-r--r--drivers/mfd/rdc321x-southbridge.c2
-rw-r--r--drivers/mfd/tps65911-comparator.c2
-rw-r--r--drivers/mmc/core/sdio.c2
-rw-r--r--drivers/mmc/host/at91_mci.c2
-rw-r--r--drivers/mmc/host/atmel-mci.c2
-rw-r--r--drivers/mmc/host/omap_hsmmc.c2
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c2
-rw-r--r--drivers/mmc/host/vub300.c2
-rw-r--r--drivers/net/ethernet/3com/typhoon.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h2
-rw-r--r--drivers/net/wireless/b43/Kconfig4
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c6
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192de/fw.c6
-rw-r--r--drivers/pci/.gitignore4
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_core.c2
-rw-r--r--drivers/scsi/bfa/bfa_ioc.c2
-rw-r--r--drivers/scsi/bfa/bfa_ioc.h2
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_fcoe.c4
-rw-r--r--drivers/scsi/gdth.h9
-rw-r--r--drivers/scsi/ipr.c66
-rw-r--r--drivers/scsi/isci/host.c2
-rw-r--r--drivers/scsi/isci/init.c2
-rw-r--r--drivers/scsi/isci/port.c2
-rw-r--r--drivers/scsi/isci/request.c2
-rw-r--r--drivers/scsi/isci/task.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c4
-rw-r--r--drivers/scsi/megaraid.c5
-rw-r--r--drivers/scsi/megaraid.h35
-rw-r--r--drivers/scsi/mvumi.c6
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c6
-rw-r--r--drivers/scsi/vmw_pvscsi.c4
-rw-r--r--drivers/spi/spi-au1550.c2
-rw-r--r--drivers/spi/spi-bfin-sport.c2
-rw-r--r--drivers/spi/spi-oc-tiny.c2
-rw-r--r--drivers/spi/spi-ppc4xx.c4
-rw-r--r--drivers/spi/spi-topcliff-pch.c2
-rw-r--r--drivers/target/iscsi/iscsi_target_parameters.c4
-rw-r--r--drivers/video/backlight/88pm860x_bl.c1
-rw-r--r--drivers/video/exynos/exynos_mipi_dsi.c2
-rw-r--r--drivers/video/tmiofb.c4
-rw-r--r--drivers/w1/masters/ds1wm.c2
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/delayed-ref.h2
-rw-r--r--fs/btrfs/inode.c4
-rw-r--r--fs/ext2/balloc.c2
-rw-r--r--fs/ext3/balloc.c2
-rw-r--r--fs/ext3/inode.c2
-rw-r--r--fs/ext4/inode.c14
-rw-r--r--fs/ext4/mballoc.c2
-rw-r--r--fs/fs-writeback.c4
-rw-r--r--fs/libfs.c2
-rw-r--r--fs/nfs/super.c2
-rw-r--r--include/linux/irqdesc.h2
-rw-r--r--include/linux/mfd/max8998.h2
-rw-r--r--include/trace/define_trace.h2
-rw-r--r--mm/bootmem.c2
-rw-r--r--net/8021q/vlanproc.c2
-rw-r--r--scripts/coccinelle/api/memdup_user.cocci4
-rw-r--r--security/apparmor/.gitignore1
-rw-r--r--sound/oss/.gitignore1
-rw-r--r--tools/perf/util/callchain.h2
-rw-r--r--tools/perf/util/parse-events-test.c2
-rw-r--r--tools/perf/util/python-ext-sources2
-rw-r--r--tools/testing/ktest/examples/include/defaults.conf2
-rw-r--r--tools/testing/ktest/examples/include/tests.conf2
-rw-r--r--tools/testing/selftests/vm/run_vmtests6
87 files changed, 142 insertions, 207 deletions
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
index f6318f6d7baf..6f706aca2049 100644
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
@@ -98,10 +98,9 @@ static int create_nl_socket(int protocol)
98 if (rcvbufsz) 98 if (rcvbufsz)
99 if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, 99 if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
100 &rcvbufsz, sizeof(rcvbufsz)) < 0) { 100 &rcvbufsz, sizeof(rcvbufsz)) < 0) {
101 fprintf(stderr, "Unable to set socket rcv buf size " 101 fprintf(stderr, "Unable to set socket rcv buf size to %d\n",
102 "to %d\n",
103 rcvbufsz); 102 rcvbufsz);
104 return -1; 103 goto error;
105 } 104 }
106 105
107 memset(&local, 0, sizeof(local)); 106 memset(&local, 0, sizeof(local));
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 39462cf35cd4..74c25c8d8884 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -162,7 +162,6 @@ mach-types.h
162machtypes.h 162machtypes.h
163map 163map
164map_hugetlb 164map_hugetlb
165maui_boot.h
166media 165media
167mconf 166mconf
168miboot* 167miboot*
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c
index 5caa2af33207..62a190d45f38 100644
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
@@ -132,6 +132,7 @@ static int read_rom(char *path)
132 132
133 rc = write(fd, "1", 2); 133 rc = write(fd, "1", 2);
134 if (rc <= 0) { 134 if (rc <= 0) {
135 close(fd);
135 perror("write"); 136 perror("write");
136 return -1; 137 return -1;
137 } 138 }
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index 92341b84250d..0b4b63e7e9b6 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -53,7 +53,7 @@ before suspend (it is limited to 500 MB by default).
53 53
54Article about goals and implementation of Software Suspend for Linux 54Article about goals and implementation of Software Suspend for Linux
55~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 55~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
56Author: G‚ábor Kuti 56Author: Gábor Kuti
57Last revised: 2003-10-20 by Pavel Machek 57Last revised: 2003-10-20 by Pavel Machek
58 58
59Idea and goals to achieve 59Idea and goals to achieve
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index d0d0bb9e3e25..d68ea5fc812b 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -12,7 +12,7 @@ kprobes can probe (this means, all functions body except for __kprobes
12functions). Unlike the Tracepoint based event, this can be added and removed 12functions). Unlike the Tracepoint based event, this can be added and removed
13dynamically, on the fly. 13dynamically, on the fly.
14 14
15To enable this feature, build your kernel with CONFIG_KPROBE_TRACING=y. 15To enable this feature, build your kernel with CONFIG_KPROBE_EVENT=y.
16 16
17Similar to the events tracer, this doesn't need to be activated via 17Similar to the events tracer, this doesn't need to be activated via
18current_tracer. Instead of that, add probe points via 18current_tracer. Instead of that, add probe points via
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 1c1aadc8c48f..c32ae5ce9fff 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,10 +1,6 @@
1addnote 1addnote
2empty.c 2empty.c
3hack-coff 3hack-coff
4infblock.c
5infblock.h
6infcodes.c
7infcodes.h
8inffast.c 4inffast.c
9inffast.h 5inffast.h
10inffixed.h 6inffixed.h
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h
index 2c392d663dce..434e2106cc87 100644
--- a/arch/x86/include/asm/hpet.h
+++ b/arch/x86/include/asm/hpet.h
@@ -35,8 +35,6 @@
35#define HPET_ID_NUMBER_SHIFT 8 35#define HPET_ID_NUMBER_SHIFT 8
36#define HPET_ID_VENDOR_SHIFT 16 36#define HPET_ID_VENDOR_SHIFT 16
37 37
38#define HPET_ID_VENDOR_8086 0x8086
39
40#define HPET_CFG_ENABLE 0x001 38#define HPET_CFG_ENABLE 0x001
41#define HPET_CFG_LEGACY 0x002 39#define HPET_CFG_LEGACY 0x002
42#define HPET_LEGACY_8254 2 40#define HPET_LEGACY_8254 2
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 7ab6e26664a7..17d6958342e7 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -168,9 +168,9 @@ static void atc_desc_put(struct at_dma_chan *atchan, struct at_desc *desc)
168} 168}
169 169
170/** 170/**
171 * atc_desc_chain - build chain adding a descripor 171 * atc_desc_chain - build chain adding a descriptor
172 * @first: address of first descripor of the chain 172 * @first: address of first descriptor of the chain
173 * @prev: address of previous descripor of the chain 173 * @prev: address of previous descriptor of the chain
174 * @desc: descriptor to queue 174 * @desc: descriptor to queue
175 * 175 *
176 * Called from prep_* functions 176 * Called from prep_* functions
@@ -796,7 +796,7 @@ err_out:
796} 796}
797 797
798/** 798/**
799 * atc_dma_cyclic_fill_desc - Fill one period decriptor 799 * atc_dma_cyclic_fill_desc - Fill one period descriptor
800 */ 800 */
801static int 801static int
802atc_dma_cyclic_fill_desc(struct dma_chan *chan, struct at_desc *desc, 802atc_dma_cyclic_fill_desc(struct dma_chan *chan, struct at_desc *desc,
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index c64917ec313d..bb02fd981afb 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -1118,7 +1118,7 @@ fail:
1118 * @chan: channel 1118 * @chan: channel
1119 * @dma_addr: DMA mapped address of the buffer 1119 * @dma_addr: DMA mapped address of the buffer
1120 * @buf_len: length of the buffer (in bytes) 1120 * @buf_len: length of the buffer (in bytes)
1121 * @period_len: lenght of a single period 1121 * @period_len: length of a single period
1122 * @dir: direction of the operation 1122 * @dir: direction of the operation
1123 * @context: operation context (ignored) 1123 * @context: operation context (ignored)
1124 * 1124 *
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 8f84761f98ba..094437b9d823 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1015,7 +1015,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
1015 /* 1015 /*
1016 * Programming Error 1016 * Programming Error
1017 * The DMA_INTERRUPT async_tx is a NULL transfer, which will 1017 * The DMA_INTERRUPT async_tx is a NULL transfer, which will
1018 * triger a PE interrupt. 1018 * trigger a PE interrupt.
1019 */ 1019 */
1020 if (stat & FSL_DMA_SR_PE) { 1020 if (stat & FSL_DMA_SR_PE) {
1021 chan_dbg(chan, "irq: Programming Error INT\n"); 1021 chan_dbg(chan, "irq: Programming Error INT\n");
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 5084975d793c..54f580bb993c 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -572,8 +572,8 @@ static void imxdma_tasklet(unsigned long data)
572 if (desc->desc.callback) 572 if (desc->desc.callback)
573 desc->desc.callback(desc->desc.callback_param); 573 desc->desc.callback(desc->desc.callback_param);
574 574
575 /* If we are dealing with a cyclic descriptor keep it on ld_active 575 /* If we are dealing with a cyclic descriptor, keep it on ld_active
576 * and dont mark the descripor as complete. 576 * and dont mark the descriptor as complete.
577 * Only in non-cyclic cases it would be marked as complete 577 * Only in non-cyclic cases it would be marked as complete
578 */ 578 */
579 if (imxdma_chan_is_doing_cyclic(imxdmac)) 579 if (imxdma_chan_is_doing_cyclic(imxdmac))
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index 222e907bfaaa..02b21d7d38e5 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -427,7 +427,7 @@ DMA engine callback Functions*/
427 * intel_mid_dma_tx_submit - callback to submit DMA transaction 427 * intel_mid_dma_tx_submit - callback to submit DMA transaction
428 * @tx: dma engine descriptor 428 * @tx: dma engine descriptor
429 * 429 *
430 * Submit the DMA trasaction for this descriptor, start if ch idle 430 * Submit the DMA transaction for this descriptor, start if ch idle
431 */ 431 */
432static dma_cookie_t intel_mid_dma_tx_submit(struct dma_async_tx_descriptor *tx) 432static dma_cookie_t intel_mid_dma_tx_submit(struct dma_async_tx_descriptor *tx)
433{ 433{
diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h
index 1bfa9268feaf..17b42192ea58 100644
--- a/drivers/dma/intel_mid_dma_regs.h
+++ b/drivers/dma/intel_mid_dma_regs.h
@@ -168,9 +168,9 @@ union intel_mid_dma_cfg_hi {
168 * @active_list: current active descriptors 168 * @active_list: current active descriptors
169 * @queue: current queued up descriptors 169 * @queue: current queued up descriptors
170 * @free_list: current free descriptors 170 * @free_list: current free descriptors
171 * @slave: dma slave struture 171 * @slave: dma slave structure
172 * @descs_allocated: total number of decsiptors allocated 172 * @descs_allocated: total number of descriptors allocated
173 * @dma: dma device struture pointer 173 * @dma: dma device structure pointer
174 * @busy: bool representing if ch is busy (active txn) or not 174 * @busy: bool representing if ch is busy (active txn) or not
175 * @in_use: bool representing if ch is in use or not 175 * @in_use: bool representing if ch is in use or not
176 * @raw_tfr: raw trf interrupt received 176 * @raw_tfr: raw trf interrupt received
diff --git a/drivers/dma/ioat/hw.h b/drivers/dma/ioat/hw.h
index 60e675455b6a..d2ff3fda0b18 100644
--- a/drivers/dma/ioat/hw.h
+++ b/drivers/dma/ioat/hw.h
@@ -22,7 +22,6 @@
22#define _IOAT_HW_H_ 22#define _IOAT_HW_H_
23 23
24/* PCI Configuration Space Values */ 24/* PCI Configuration Space Values */
25#define IOAT_PCI_VID 0x8086
26#define IOAT_MMIO_BAR 0 25#define IOAT_MMIO_BAR 0
27 26
28/* CB device ID's */ 27/* CB device ID's */
@@ -31,9 +30,6 @@
31#define IOAT_PCI_DID_SCNB 0x65FF 30#define IOAT_PCI_DID_SCNB 0x65FF
32#define IOAT_PCI_DID_SNB 0x402F 31#define IOAT_PCI_DID_SNB 0x402F
33 32
34#define IOAT_PCI_RID 0x00
35#define IOAT_PCI_SVID 0x8086
36#define IOAT_PCI_SID 0x8086
37#define IOAT_VER_1_2 0x12 /* Version 1.2 */ 33#define IOAT_VER_1_2 0x12 /* Version 1.2 */
38#define IOAT_VER_2_0 0x20 /* Version 2.0 */ 34#define IOAT_VER_2_0 0x20 /* Version 2.0 */
39#define IOAT_VER_3_0 0x30 /* Version 3.0 */ 35#define IOAT_VER_3_0 0x30 /* Version 3.0 */
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index f5843bc80baa..5d3bbcd279b4 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -522,7 +522,7 @@ enum desc_status {
522 /* In the DMAC pool */ 522 /* In the DMAC pool */
523 FREE, 523 FREE,
524 /* 524 /*
525 * Allocted to some channel during prep_xxx 525 * Allocated to some channel during prep_xxx
526 * Also may be sitting on the work_list. 526 * Also may be sitting on the work_list.
527 */ 527 */
528 PREP, 528 PREP,
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index ced98826684a..f72348d0bc41 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4446,7 +4446,7 @@ static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev)
4446 ret = -ENOMEM; 4446 ret = -ENOMEM;
4447 goto err_dma_alloc; 4447 goto err_dma_alloc;
4448 } 4448 }
4449 dev_dbg(&ofdev->dev, "allocted descriptor pool virt 0x%p phys 0x%llx\n", 4449 dev_dbg(&ofdev->dev, "allocated descriptor pool virt 0x%p phys 0x%llx\n",
4450 adev->dma_desc_pool_virt, (u64)adev->dma_desc_pool); 4450 adev->dma_desc_pool_virt, (u64)adev->dma_desc_pool);
4451 4451
4452 regs = ioremap(res.start, resource_size(&res)); 4452 regs = ioremap(res.start, resource_size(&res));
diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h
index 51e8e5396e9b..6d47373f3f58 100644
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
@@ -202,7 +202,7 @@
202/* LLI related structures */ 202/* LLI related structures */
203 203
204/** 204/**
205 * struct d40_phy_lli - The basic configration register for each physical 205 * struct d40_phy_lli - The basic configuration register for each physical
206 * channel. 206 * channel.
207 * 207 *
208 * @reg_cfg: The configuration register. 208 * @reg_cfg: The configuration register.
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 866f95960b4b..29d72a259c85 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -342,7 +342,7 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
342 342
343 /* 343 /*
344 * Delay might be needed for ABB8500 cut 3.0, if not, remove 344 * Delay might be needed for ABB8500 cut 3.0, if not, remove
345 * when hardware will be availible 345 * when hardware will be available
346 */ 346 */
347 msleep(1); 347 msleep(1);
348 break; 348 break;
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 3a8fa88567b1..ff61efc76ce2 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -281,7 +281,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
281 281
282 if (i2c->irq) { 282 if (i2c->irq) {
283 ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base); 283 ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
284 /* Still continue with waring if irq init fails */ 284 /* Still continue with warning, if irq init fails */
285 if (ret) 285 if (ret)
286 dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret); 286 dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret);
287 else 287 else
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 0f70dce61160..fbabc3cbe350 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * RDC321x MFD southbrige driver 2 * RDC321x MFD southbridge driver
3 * 3 *
4 * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org> 4 * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
5 * Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com> 5 * Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com>
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index 5a62e6bf89ae..0b6e361432c4 100644
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -136,7 +136,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev)
136 136
137 ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold); 137 ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold);
138 if (ret < 0) { 138 if (ret < 0) {
139 dev_err(&pdev->dev, "cannot set COMP2 theshold\n"); 139 dev_err(&pdev->dev, "cannot set COMP2 threshold\n");
140 return ret; 140 return ret;
141 } 141 }
142 142
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index d4619e2ec030..2273ce6b6c1a 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -641,7 +641,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
641 /* 641 /*
642 * If the host and card support UHS-I mode request the card 642 * If the host and card support UHS-I mode request the card
643 * to switch to 1.8V signaling level. No 1.8v signalling if 643 * to switch to 1.8V signaling level. No 1.8v signalling if
644 * UHS mode is not enabled to maintain compatibilty and some 644 * UHS mode is not enabled to maintain compatibility and some
645 * systems that claim 1.8v signalling in fact do not support 645 * systems that claim 1.8v signalling in fact do not support
646 * it. 646 * it.
647 */ 647 */
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index efdb81d21c44..74bed0fc23e7 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -356,7 +356,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
356} 356}
357 357
358/* 358/*
359 * Update bytes tranfered count during a write operation 359 * Update bytes transfered count during a write operation
360 */ 360 */
361static void at91_mci_update_bytes_xfered(struct at91mci_host *host) 361static void at91_mci_update_bytes_xfered(struct at91mci_host *host)
362{ 362{
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index a53c7c478e05..852d5fbda630 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1022,7 +1022,7 @@ static void atmci_stop_transfer(struct atmel_mci *host)
1022} 1022}
1023 1023
1024/* 1024/*
1025 * Stop data transfer because error(s) occured. 1025 * Stop data transfer because error(s) occurred.
1026 */ 1026 */
1027static void atmci_stop_transfer_pdc(struct atmel_mci *host) 1027static void atmci_stop_transfer_pdc(struct atmel_mci *host)
1028{ 1028{
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 3a09f93cc3b6..686e256764c8 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -447,7 +447,7 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
447 OMAP_HSMMC_WRITE(host->base, SYSCTL, 447 OMAP_HSMMC_WRITE(host->base, SYSCTL,
448 OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN); 448 OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN);
449 if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0) 449 if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0)
450 dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n"); 450 dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stopped\n");
451} 451}
452 452
453static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, 453static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index e23f8134591c..32f4a070551f 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -315,7 +315,7 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
315 new_val = val & (SDHCI_CTRL_LED | \ 315 new_val = val & (SDHCI_CTRL_LED | \
316 SDHCI_CTRL_4BITBUS | \ 316 SDHCI_CTRL_4BITBUS | \
317 SDHCI_CTRL_D3CD); 317 SDHCI_CTRL_D3CD);
318 /* ensure the endianess */ 318 /* ensure the endianness */
319 new_val |= ESDHC_HOST_CONTROL_LE; 319 new_val |= ESDHC_HOST_CONTROL_LE;
320 /* bits 8&9 are reserved on mx25 */ 320 /* bits 8&9 are reserved on mx25 */
321 if (!is_imx25_esdhc(imx_data)) { 321 if (!is_imx25_esdhc(imx_data)) {
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index 3135a1a5d75d..58eab9ac1d01 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -806,7 +806,7 @@ static void command_res_completed(struct urb *urb)
806 * we suspect a buggy USB host controller 806 * we suspect a buggy USB host controller
807 */ 807 */
808 } else if (!vub300->data) { 808 } else if (!vub300->data) {
809 /* this means that the command (typically CMD52) suceeded */ 809 /* this means that the command (typically CMD52) succeeded */
810 } else if (vub300->resp.common.header_type != 0x02) { 810 } else if (vub300->resp.common.header_type != 0x02) {
811 /* 811 /*
812 * this is an error response from the VUB300 chip 812 * this is an error response from the VUB300 chip
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index b15366635147..bb9670f29b59 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -364,7 +364,7 @@ typhoon_inc_rxfree_index(u32 *index, const int count)
364static inline void 364static inline void
365typhoon_inc_tx_index(u32 *index, const int count) 365typhoon_inc_tx_index(u32 *index, const int count)
366{ 366{
367 /* if we start using the Hi Tx ring, this needs updateing */ 367 /* if we start using the Hi Tx ring, this needs updating */
368 typhoon_inc_index(index, count, TXLO_ENTRIES); 368 typhoon_inc_index(index, count, TXLO_ENTRIES);
369} 369}
370 370
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 6d1a24acb77e..eac25236856c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1458,7 +1458,7 @@ struct bnx2x {
1458 int fw_stats_req_sz; 1458 int fw_stats_req_sz;
1459 1459
1460 /* 1460 /*
1461 * FW statistics data shortcut (points at the begining of 1461 * FW statistics data shortcut (points at the beginning of
1462 * fw_stats buffer + fw_stats_req_sz). 1462 * fw_stats buffer + fw_stats_req_sz).
1463 */ 1463 */
1464 struct bnx2x_fw_stats_data *fw_stats_data; 1464 struct bnx2x_fw_stats_data *fw_stats_data;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index f83e033da6da..acf2fe4ca608 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -1321,7 +1321,7 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,
1321 * the current command will be enqueued to the tail of the 1321 * the current command will be enqueued to the tail of the
1322 * pending commands list. 1322 * pending commands list.
1323 * 1323 *
1324 * Return: 0 is operation was sucessfull and there are no pending completions, 1324 * Return: 0 is operation was successfull and there are no pending completions,
1325 * negative if there were errors, positive if there are pending 1325 * negative if there were errors, positive if there are pending
1326 * completions. 1326 * completions.
1327 */ 1327 */
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 3876c7ea54f4..7a28d21ac389 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -34,8 +34,8 @@ config B43_BCMA
34config B43_BCMA_EXTRA 34config B43_BCMA_EXTRA
35 bool "Hardware support that overlaps with the brcmsmac driver" 35 bool "Hardware support that overlaps with the brcmsmac driver"
36 depends on B43_BCMA 36 depends on B43_BCMA
37 default n if BRCMSMAC || BRCMSMAC_MODULE 37 default n if BRCMSMAC
38 default y 38 default y
39 39
40config B43_SSB 40config B43_SSB
41 bool 41 bool
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 44febfde9493..8a7b864faca3 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -315,7 +315,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
315 u16 box_reg = 0, box_extreg = 0; 315 u16 box_reg = 0, box_extreg = 0;
316 u8 u1b_tmp; 316 u8 u1b_tmp;
317 bool isfw_read = false; 317 bool isfw_read = false;
318 bool bwrite_sucess = false; 318 bool bwrite_success = false;
319 u8 wait_h2c_limmit = 100; 319 u8 wait_h2c_limmit = 100;
320 u8 wait_writeh2c_limmit = 100; 320 u8 wait_writeh2c_limmit = 100;
321 u8 boxcontent[4], boxextcontent[2]; 321 u8 boxcontent[4], boxextcontent[2];
@@ -354,7 +354,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
354 } 354 }
355 } 355 }
356 356
357 while (!bwrite_sucess) { 357 while (!bwrite_success) {
358 wait_writeh2c_limmit--; 358 wait_writeh2c_limmit--;
359 if (wait_writeh2c_limmit == 0) { 359 if (wait_writeh2c_limmit == 0) {
360 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 360 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -491,7 +491,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
491 break; 491 break;
492 } 492 }
493 493
494 bwrite_sucess = true; 494 bwrite_success = true;
495 495
496 rtlhal->last_hmeboxnum = boxnum + 1; 496 rtlhal->last_hmeboxnum = boxnum + 1;
497 if (rtlhal->last_hmeboxnum == 4) 497 if (rtlhal->last_hmeboxnum == 4)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index 895ae6c1f354..eb22dccc418b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -365,7 +365,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
365 u8 u1b_tmp; 365 u8 u1b_tmp;
366 bool isfw_read = false; 366 bool isfw_read = false;
367 u8 buf_index = 0; 367 u8 buf_index = 0;
368 bool bwrite_sucess = false; 368 bool bwrite_success = false;
369 u8 wait_h2c_limmit = 100; 369 u8 wait_h2c_limmit = 100;
370 u8 wait_writeh2c_limmit = 100; 370 u8 wait_writeh2c_limmit = 100;
371 u8 boxcontent[4], boxextcontent[2]; 371 u8 boxcontent[4], boxextcontent[2];
@@ -408,7 +408,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
408 break; 408 break;
409 } 409 }
410 } 410 }
411 while (!bwrite_sucess) { 411 while (!bwrite_success) {
412 wait_writeh2c_limmit--; 412 wait_writeh2c_limmit--;
413 if (wait_writeh2c_limmit == 0) { 413 if (wait_writeh2c_limmit == 0) {
414 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 414 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -515,7 +515,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
515 "switch case not processed\n"); 515 "switch case not processed\n");
516 break; 516 break;
517 } 517 }
518 bwrite_sucess = true; 518 bwrite_success = true;
519 rtlhal->last_hmeboxnum = boxnum + 1; 519 rtlhal->last_hmeboxnum = boxnum + 1;
520 if (rtlhal->last_hmeboxnum == 4) 520 if (rtlhal->last_hmeboxnum == 4)
521 rtlhal->last_hmeboxnum = 0; 521 rtlhal->last_hmeboxnum = 0;
diff --git a/drivers/pci/.gitignore b/drivers/pci/.gitignore
deleted file mode 100644
index f297ca8d313e..000000000000
--- a/drivers/pci/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
1classlist.h
2devlist.h
3gen-devlist
4
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 25417d0e7acb..0bcacf71aef8 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -2888,7 +2888,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
2888 ahd_outb(ahd, CLRINT, CLRSCSIINT); 2888 ahd_outb(ahd, CLRINT, CLRSCSIINT);
2889 ahd_unpause(ahd); 2889 ahd_unpause(ahd);
2890 } else { 2890 } else {
2891 printk("Reseting Channel for LQI Phase error\n"); 2891 printk("Resetting Channel for LQI Phase error\n");
2892 ahd_dump_card_state(ahd); 2892 ahd_dump_card_state(ahd);
2893 ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); 2893 ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
2894 } 2894 }
diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c
index 8cdb79c2fcdf..21ad2902e5ce 100644
--- a/drivers/scsi/bfa/bfa_ioc.c
+++ b/drivers/scsi/bfa/bfa_ioc.c
@@ -5587,7 +5587,7 @@ static bfa_status_t bfa_dconf_flash_write(struct bfa_dconf_mod_s *dconf);
5587static void bfa_dconf_init_cb(void *arg, bfa_status_t status); 5587static void bfa_dconf_init_cb(void *arg, bfa_status_t status);
5588 5588
5589/* 5589/*
5590 * Begining state of dconf module. Waiting for an event to start. 5590 * Beginning state of dconf module. Waiting for an event to start.
5591 */ 5591 */
5592static void 5592static void
5593bfa_dconf_sm_uninit(struct bfa_dconf_mod_s *dconf, enum bfa_dconf_event event) 5593bfa_dconf_sm_uninit(struct bfa_dconf_mod_s *dconf, enum bfa_dconf_event event)
diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
index 1a99d4b5b50f..7b916e04ca56 100644
--- a/drivers/scsi/bfa/bfa_ioc.h
+++ b/drivers/scsi/bfa/bfa_ioc.h
@@ -530,7 +530,7 @@ struct bfa_diag_results_fwping {
530 530
531struct bfa_diag_qtest_result_s { 531struct bfa_diag_qtest_result_s {
532 u32 status; 532 u32 status;
533 u16 count; /* sucessful queue test count */ 533 u16 count; /* successful queue test count */
534 u8 queue; 534 u8 queue;
535 u8 rsvd; /* 64-bit align */ 535 u8 rsvd; /* 64-bit align */
536}; 536};
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index ae1cb7639d99..e0558656c646 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -908,7 +908,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
908 return; 908 return;
909 909
910 default: 910 default:
911 printk(KERN_ERR PFX "Unkonwn netevent %ld", event); 911 printk(KERN_ERR PFX "Unknown netevent %ld", event);
912 return; 912 return;
913 } 913 }
914 914
@@ -1738,7 +1738,7 @@ static int bnx2fc_ulp_get_stats(void *handle)
1738/** 1738/**
1739 * bnx2fc_ulp_start - cnic callback to initialize & start adapter instance 1739 * bnx2fc_ulp_start - cnic callback to initialize & start adapter instance
1740 * 1740 *
1741 * @handle: transport handle pointing to adapter struture 1741 * @handle: transport handle pointing to adapter structure
1742 * 1742 *
1743 * This function maps adapter structure to pcidev structure and initiates 1743 * This function maps adapter structure to pcidev structure and initiates
1744 * firmware handshake to enable/initialize on-chip FCoE components. 1744 * firmware handshake to enable/initialize on-chip FCoE components.
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index d3e4d7c6f577..fbf6f0f4b0dd 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -49,15 +49,6 @@
49/* GDT_ISA */ 49/* GDT_ISA */
50#define GDT2_ID 0x0120941c /* GDT2000/2020 */ 50#define GDT2_ID 0x0120941c /* GDT2000/2020 */
51 51
52/* vendor ID, device IDs (PCI) */
53/* these defines should already exist in <linux/pci.h> */
54#ifndef PCI_VENDOR_ID_VORTEX
55#define PCI_VENDOR_ID_VORTEX 0x1119 /* PCI controller vendor ID */
56#endif
57#ifndef PCI_VENDOR_ID_INTEL
58#define PCI_VENDOR_ID_INTEL 0x8086
59#endif
60
61#ifndef PCI_DEVICE_ID_VORTEX_GDT60x0 52#ifndef PCI_DEVICE_ID_VORTEX_GDT60x0
62/* GDT_PCI */ 53/* GDT_PCI */
63#define PCI_DEVICE_ID_VORTEX_GDT60x0 0 /* GDT6000/6020/6050 */ 54#define PCI_DEVICE_ID_VORTEX_GDT60x0 0 /* GDT6000/6020/6050 */
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 467dc38246f9..1059c99690e6 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -192,7 +192,7 @@ static const struct ipr_chip_t ipr_chip[] = {
192 { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] } 192 { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] }
193}; 193};
194 194
195static int ipr_max_bus_speeds [] = { 195static int ipr_max_bus_speeds[] = {
196 IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE 196 IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE
197}; 197};
198 198
@@ -562,7 +562,7 @@ static void ipr_trc_hook(struct ipr_cmnd *ipr_cmd,
562 trace_entry->u.add_data = add_data; 562 trace_entry->u.add_data = add_data;
563} 563}
564#else 564#else
565#define ipr_trc_hook(ipr_cmd, type, add_data) do { } while(0) 565#define ipr_trc_hook(ipr_cmd, type, add_data) do { } while (0)
566#endif 566#endif
567 567
568/** 568/**
@@ -1002,7 +1002,7 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type,
1002 **/ 1002 **/
1003static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto) 1003static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto)
1004{ 1004{
1005 switch(proto) { 1005 switch (proto) {
1006 case IPR_PROTO_SATA: 1006 case IPR_PROTO_SATA:
1007 case IPR_PROTO_SAS_STP: 1007 case IPR_PROTO_SAS_STP:
1008 res->ata_class = ATA_DEV_ATA; 1008 res->ata_class = ATA_DEV_ATA;
@@ -3043,7 +3043,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
3043} 3043}
3044 3044
3045#else 3045#else
3046#define ipr_get_ioa_dump(ioa_cfg, dump) do { } while(0) 3046#define ipr_get_ioa_dump(ioa_cfg, dump) do { } while (0)
3047#endif 3047#endif
3048 3048
3049/** 3049/**
@@ -3055,7 +3055,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
3055 **/ 3055 **/
3056static void ipr_release_dump(struct kref *kref) 3056static void ipr_release_dump(struct kref *kref)
3057{ 3057{
3058 struct ipr_dump *dump = container_of(kref,struct ipr_dump,kref); 3058 struct ipr_dump *dump = container_of(kref, struct ipr_dump, kref);
3059 struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg; 3059 struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg;
3060 unsigned long lock_flags = 0; 3060 unsigned long lock_flags = 0;
3061 int i; 3061 int i;
@@ -3142,7 +3142,7 @@ restart:
3142 break; 3142 break;
3143 } 3143 }
3144 } 3144 }
3145 } while(did_work); 3145 } while (did_work);
3146 3146
3147 list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { 3147 list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
3148 if (res->add_to_ml) { 3148 if (res->add_to_ml) {
@@ -3268,7 +3268,7 @@ static ssize_t ipr_show_log_level(struct device *dev,
3268 * number of bytes printed to buffer 3268 * number of bytes printed to buffer
3269 **/ 3269 **/
3270static ssize_t ipr_store_log_level(struct device *dev, 3270static ssize_t ipr_store_log_level(struct device *dev,
3271 struct device_attribute *attr, 3271 struct device_attribute *attr,
3272 const char *buf, size_t count) 3272 const char *buf, size_t count)
3273{ 3273{
3274 struct Scsi_Host *shost = class_to_shost(dev); 3274 struct Scsi_Host *shost = class_to_shost(dev);
@@ -3315,7 +3315,7 @@ static ssize_t ipr_store_diagnostics(struct device *dev,
3315 return -EACCES; 3315 return -EACCES;
3316 3316
3317 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3317 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
3318 while(ioa_cfg->in_reset_reload) { 3318 while (ioa_cfg->in_reset_reload) {
3319 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 3319 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
3320 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 3320 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
3321 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3321 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -3682,7 +3682,7 @@ static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg,
3682 unsigned long lock_flags; 3682 unsigned long lock_flags;
3683 3683
3684 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3684 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
3685 while(ioa_cfg->in_reset_reload) { 3685 while (ioa_cfg->in_reset_reload) {
3686 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 3686 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
3687 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 3687 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
3688 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 3688 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -3746,7 +3746,7 @@ static ssize_t ipr_store_update_fw(struct device *dev,
3746 len = snprintf(fname, 99, "%s", buf); 3746 len = snprintf(fname, 99, "%s", buf);
3747 fname[len-1] = '\0'; 3747 fname[len-1] = '\0';
3748 3748
3749 if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { 3749 if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
3750 dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); 3750 dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
3751 return -EIO; 3751 return -EIO;
3752 } 3752 }
@@ -4612,7 +4612,7 @@ static int ipr_slave_alloc(struct scsi_device *sdev)
4612 * Return value: 4612 * Return value:
4613 * SUCCESS / FAILED 4613 * SUCCESS / FAILED
4614 **/ 4614 **/
4615static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd) 4615static int __ipr_eh_host_reset(struct scsi_cmnd *scsi_cmd)
4616{ 4616{
4617 struct ipr_ioa_cfg *ioa_cfg; 4617 struct ipr_ioa_cfg *ioa_cfg;
4618 int rc; 4618 int rc;
@@ -4634,7 +4634,7 @@ static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
4634 return rc; 4634 return rc;
4635} 4635}
4636 4636
4637static int ipr_eh_host_reset(struct scsi_cmnd * cmd) 4637static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
4638{ 4638{
4639 int rc; 4639 int rc;
4640 4640
@@ -4701,7 +4701,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
4701 } 4701 }
4702 4702
4703 LEAVE; 4703 LEAVE;
4704 return (IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0); 4704 return IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0;
4705} 4705}
4706 4706
4707/** 4707/**
@@ -4725,7 +4725,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
4725 4725
4726 ENTER; 4726 ENTER;
4727 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 4727 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
4728 while(ioa_cfg->in_reset_reload) { 4728 while (ioa_cfg->in_reset_reload) {
4729 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 4729 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
4730 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 4730 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
4731 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 4731 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -4753,7 +4753,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
4753 * Return value: 4753 * Return value:
4754 * SUCCESS / FAILED 4754 * SUCCESS / FAILED
4755 **/ 4755 **/
4756static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd) 4756static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
4757{ 4757{
4758 struct ipr_cmnd *ipr_cmd; 4758 struct ipr_cmnd *ipr_cmd;
4759 struct ipr_ioa_cfg *ioa_cfg; 4759 struct ipr_ioa_cfg *ioa_cfg;
@@ -4811,10 +4811,10 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
4811 res->resetting_device = 0; 4811 res->resetting_device = 0;
4812 4812
4813 LEAVE; 4813 LEAVE;
4814 return (rc ? FAILED : SUCCESS); 4814 return rc ? FAILED : SUCCESS;
4815} 4815}
4816 4816
4817static int ipr_eh_dev_reset(struct scsi_cmnd * cmd) 4817static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
4818{ 4818{
4819 int rc; 4819 int rc;
4820 4820
@@ -4910,7 +4910,7 @@ static void ipr_abort_timeout(struct ipr_cmnd *ipr_cmd)
4910 * Return value: 4910 * Return value:
4911 * SUCCESS / FAILED 4911 * SUCCESS / FAILED
4912 **/ 4912 **/
4913static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) 4913static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd)
4914{ 4914{
4915 struct ipr_cmnd *ipr_cmd; 4915 struct ipr_cmnd *ipr_cmd;
4916 struct ipr_ioa_cfg *ioa_cfg; 4916 struct ipr_ioa_cfg *ioa_cfg;
@@ -4979,7 +4979,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
4979 res->needs_sync_complete = 1; 4979 res->needs_sync_complete = 1;
4980 4980
4981 LEAVE; 4981 LEAVE;
4982 return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS); 4982 return IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS;
4983} 4983}
4984 4984
4985/** 4985/**
@@ -4989,7 +4989,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
4989 * Return value: 4989 * Return value:
4990 * SUCCESS / FAILED 4990 * SUCCESS / FAILED
4991 **/ 4991 **/
4992static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd) 4992static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd)
4993{ 4993{
4994 unsigned long flags; 4994 unsigned long flags;
4995 int rc; 4995 int rc;
@@ -5907,7 +5907,7 @@ static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
5907 * Return value: 5907 * Return value:
5908 * pointer to buffer with description string 5908 * pointer to buffer with description string
5909 **/ 5909 **/
5910static const char * ipr_ioa_info(struct Scsi_Host *host) 5910static const char *ipr_ioa_info(struct Scsi_Host *host)
5911{ 5911{
5912 static char buffer[512]; 5912 static char buffer[512];
5913 struct ipr_ioa_cfg *ioa_cfg; 5913 struct ipr_ioa_cfg *ioa_cfg;
@@ -5965,7 +5965,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
5965 5965
5966 ENTER; 5966 ENTER;
5967 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 5967 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
5968 while(ioa_cfg->in_reset_reload) { 5968 while (ioa_cfg->in_reset_reload) {
5969 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); 5969 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
5970 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 5970 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
5971 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 5971 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@@ -6005,7 +6005,7 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc)
6005 unsigned long flags; 6005 unsigned long flags;
6006 6006
6007 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6007 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
6008 while(ioa_cfg->in_reset_reload) { 6008 while (ioa_cfg->in_reset_reload) {
6009 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); 6009 spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
6010 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 6010 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
6011 spin_lock_irqsave(ioa_cfg->host->host_lock, flags); 6011 spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@@ -6330,7 +6330,7 @@ static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
6330 int i; 6330 int i;
6331 6331
6332 if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) { 6332 if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
6333 for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){ 6333 for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
6334 if (__is_processor(ipr_blocked_processors[i])) 6334 if (__is_processor(ipr_blocked_processors[i]))
6335 return 1; 6335 return 1;
6336 } 6336 }
@@ -6608,7 +6608,7 @@ static void ipr_scsi_bus_speed_limit(struct ipr_ioa_cfg *ioa_cfg)
6608 * none 6608 * none
6609 **/ 6609 **/
6610static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg, 6610static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg,
6611 struct ipr_mode_pages *mode_pages) 6611 struct ipr_mode_pages *mode_pages)
6612{ 6612{
6613 int i, entry_length; 6613 int i, entry_length;
6614 struct ipr_dev_bus_entry *bus; 6614 struct ipr_dev_bus_entry *bus;
@@ -8022,7 +8022,7 @@ static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd)
8022 ipr_reinit_ipr_cmnd(ipr_cmd); 8022 ipr_reinit_ipr_cmnd(ipr_cmd);
8023 ipr_cmd->job_step_failed = ipr_reset_cmd_failed; 8023 ipr_cmd->job_step_failed = ipr_reset_cmd_failed;
8024 rc = ipr_cmd->job_step(ipr_cmd); 8024 rc = ipr_cmd->job_step(ipr_cmd);
8025 } while(rc == IPR_RC_JOB_CONTINUE); 8025 } while (rc == IPR_RC_JOB_CONTINUE);
8026} 8026}
8027 8027
8028/** 8028/**
@@ -8283,7 +8283,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8283 } 8283 }
8284 8284
8285 if (ioa_cfg->ipr_cmd_pool) 8285 if (ioa_cfg->ipr_cmd_pool)
8286 pci_pool_destroy (ioa_cfg->ipr_cmd_pool); 8286 pci_pool_destroy(ioa_cfg->ipr_cmd_pool);
8287 8287
8288 kfree(ioa_cfg->ipr_cmnd_list); 8288 kfree(ioa_cfg->ipr_cmnd_list);
8289 kfree(ioa_cfg->ipr_cmnd_list_dma); 8289 kfree(ioa_cfg->ipr_cmnd_list_dma);
@@ -8363,8 +8363,8 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8363 dma_addr_t dma_addr; 8363 dma_addr_t dma_addr;
8364 int i; 8364 int i;
8365 8365
8366 ioa_cfg->ipr_cmd_pool = pci_pool_create (IPR_NAME, ioa_cfg->pdev, 8366 ioa_cfg->ipr_cmd_pool = pci_pool_create(IPR_NAME, ioa_cfg->pdev,
8367 sizeof(struct ipr_cmnd), 512, 0); 8367 sizeof(struct ipr_cmnd), 512, 0);
8368 8368
8369 if (!ioa_cfg->ipr_cmd_pool) 8369 if (!ioa_cfg->ipr_cmd_pool)
8370 return -ENOMEM; 8370 return -ENOMEM;
@@ -8378,7 +8378,7 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
8378 } 8378 }
8379 8379
8380 for (i = 0; i < IPR_NUM_CMD_BLKS; i++) { 8380 for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
8381 ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr); 8381 ipr_cmd = pci_pool_alloc(ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr);
8382 8382
8383 if (!ipr_cmd) { 8383 if (!ipr_cmd) {
8384 ipr_free_cmd_blks(ioa_cfg); 8384 ipr_free_cmd_blks(ioa_cfg);
@@ -8964,7 +8964,7 @@ static void ipr_scan_vsets(struct ipr_ioa_cfg *ioa_cfg)
8964 int target, lun; 8964 int target, lun;
8965 8965
8966 for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++) 8966 for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++)
8967 for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++ ) 8967 for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++)
8968 scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun); 8968 scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun);
8969} 8969}
8970 8970
@@ -9010,7 +9010,7 @@ static void __ipr_remove(struct pci_dev *pdev)
9010 ENTER; 9010 ENTER;
9011 9011
9012 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 9012 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
9013 while(ioa_cfg->in_reset_reload) { 9013 while (ioa_cfg->in_reset_reload) {
9014 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); 9014 spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
9015 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 9015 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
9016 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); 9016 spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
@@ -9139,7 +9139,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
9139 unsigned long lock_flags = 0; 9139 unsigned long lock_flags = 0;
9140 9140
9141 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 9141 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
9142 while(ioa_cfg->in_reset_reload) { 9142 while (ioa_cfg->in_reset_reload) {
9143 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); 9143 spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
9144 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); 9144 wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
9145 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 9145 spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 45385f531649..b334fdc1726a 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -492,7 +492,7 @@ static void sci_controller_process_completions(struct isci_host *ihost)
492 u32 event_cycle; 492 u32 event_cycle;
493 493
494 dev_dbg(&ihost->pdev->dev, 494 dev_dbg(&ihost->pdev->dev,
495 "%s: completion queue begining get:0x%08x\n", 495 "%s: completion queue beginning get:0x%08x\n",
496 __func__, 496 __func__,
497 ihost->completion_queue_get); 497 ihost->completion_queue_get);
498 498
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 92c1d86d1fc6..9be45a2b2232 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -222,7 +222,7 @@ static struct sas_domain_function_template isci_transport_ops = {
222 * @isci_host: This parameter specifies the lldd specific wrapper for the 222 * @isci_host: This parameter specifies the lldd specific wrapper for the
223 * libsas sas_ha struct. 223 * libsas sas_ha struct.
224 * 224 *
225 * This method returns an error code indicating sucess or failure. The user 225 * This method returns an error code indicating success or failure. The user
226 * should check for possible memory allocation error return otherwise, a zero 226 * should check for possible memory allocation error return otherwise, a zero
227 * indicates success. 227 * indicates success.
228 */ 228 */
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 2fb85bf75449..13098b09a824 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -212,7 +212,7 @@ static void isci_port_link_up(struct isci_host *isci_host,
212 memcpy(iphy->sas_phy.attached_sas_addr, 212 memcpy(iphy->sas_phy.attached_sas_addr,
213 iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE); 213 iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE);
214 } else { 214 } else {
215 dev_err(&isci_host->pdev->dev, "%s: unkown target\n", __func__); 215 dev_err(&isci_host->pdev->dev, "%s: unknown target\n", __func__);
216 success = false; 216 success = false;
217 } 217 }
218 218
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 7a0431c73493..c1bafc3f3fb1 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -2240,7 +2240,7 @@ static enum sci_status atapi_data_tc_completion_handler(struct isci_request *ire
2240 status = ireq->sci_status; 2240 status = ireq->sci_status;
2241 sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR); 2241 sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR);
2242 } else { 2242 } else {
2243 /* If receiving any non-sucess TC status, no UF 2243 /* If receiving any non-success TC status, no UF
2244 * received yet, then an UF for the status fis 2244 * received yet, then an UF for the status fis
2245 * is coming after (XXX: suspect this is 2245 * is coming after (XXX: suspect this is
2246 * actually a protocol error or a bug like the 2246 * actually a protocol error or a bug like the
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 6bc74eb012c9..b6f19a1db780 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -532,7 +532,7 @@ int isci_task_abort_task(struct sas_task *task)
532 /* The request has already completed and there 532 /* The request has already completed and there
533 * is nothing to do here other than to set the task 533 * is nothing to do here other than to set the task
534 * done bit, and indicate that the task abort function 534 * done bit, and indicate that the task abort function
535 * was sucessful. 535 * was successful.
536 */ 536 */
537 spin_lock_irqsave(&task->task_state_lock, flags); 537 spin_lock_irqsave(&task->task_state_lock, flags);
538 task->task_state_flags |= SAS_TASK_STATE_DONE; 538 task->task_state_flags |= SAS_TASK_STATE_DONE;
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 45c15208be9f..29937b606c84 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -6607,7 +6607,7 @@ out_error:
6607 * we just use some constant number as place holder. 6607 * we just use some constant number as place holder.
6608 * 6608 *
6609 * Return codes 6609 * Return codes
6610 * 0 - sucessful 6610 * 0 - successful
6611 * -ENOMEM - No availble memory 6611 * -ENOMEM - No availble memory
6612 * -EIO - The mailbox failed to complete successfully. 6612 * -EIO - The mailbox failed to complete successfully.
6613 **/ 6613 **/
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 9cbd20b1328b..0e7e144507b2 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4739,7 +4739,7 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
4739 * is attached to. 4739 * is attached to.
4740 * 4740 *
4741 * Return codes 4741 * Return codes
4742 * 0 - sucessful 4742 * 0 - successful
4743 * otherwise - failed to retrieve physical port name 4743 * otherwise - failed to retrieve physical port name
4744 **/ 4744 **/
4745static int 4745static int
@@ -15209,7 +15209,7 @@ lpfc_check_next_fcf_pri_level(struct lpfc_hba *phba)
15209 /* 15209 /*
15210 * if next_fcf_pri was not set above and the list is not empty then 15210 * if next_fcf_pri was not set above and the list is not empty then
15211 * we have failed flogis on all of them. So reset flogi failed 15211 * we have failed flogis on all of them. So reset flogi failed
15212 * and start at the begining. 15212 * and start at the beginning.
15213 */ 15213 */
15214 if (!next_fcf_pri && !list_empty(&phba->fcf.fcf_pri_list)) { 15214 if (!next_fcf_pri && !list_empty(&phba->fcf.fcf_pri_list)) {
15215 list_for_each_entry(fcf_pri, &phba->fcf.fcf_pri_list, list) { 15215 list_for_each_entry(fcf_pri, &phba->fcf.fcf_pri_list, list) {
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 97825f116954..76ad72d32c3f 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
305 305
306 adapter->host->sg_tablesize = adapter->sglen; 306 adapter->host->sg_tablesize = adapter->sglen;
307 307
308
309 /* use HP firmware and bios version encoding 308 /* use HP firmware and bios version encoding
310 Note: fw_version[0|1] and bios_version[0|1] were originally shifted 309 Note: fw_version[0|1] and bios_version[0|1] were originally shifted
311 right 8 bits making them zero. This 0 value was hardcoded to fix 310 right 8 bits making them zero. This 0 value was hardcoded to fix
312 sparse warnings. */ 311 sparse warnings. */
313 if (adapter->product_info.subsysvid == HP_SUBSYS_VID) { 312 if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
314 sprintf (adapter->fw_version, "%c%d%d.%d%d", 313 sprintf (adapter->fw_version, "%c%d%d.%d%d",
315 adapter->product_info.fw_version[2], 314 adapter->product_info.fw_version[2],
316 0, 315 0,
@@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
4716 * support, since this firmware cannot handle 64 bit 4715 * support, since this firmware cannot handle 64 bit
4717 * addressing 4716 * addressing
4718 */ 4717 */
4719 if ((subsysvid == HP_SUBSYS_VID) && 4718 if ((subsysvid == PCI_VENDOR_ID_HP) &&
4720 ((subsysid == 0x60E7) || (subsysid == 0x60E8))) { 4719 ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
4721 /* 4720 /*
4722 * which firmware 4721 * which firmware
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 9a7897f8ca43..4fb2adf6b80d 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -45,45 +45,10 @@
45 45
46#define MAX_DEV_TYPE 32 46#define MAX_DEV_TYPE 32
47 47
48#ifndef PCI_VENDOR_ID_LSI_LOGIC
49#define PCI_VENDOR_ID_LSI_LOGIC 0x1000
50#endif
51
52#ifndef PCI_VENDOR_ID_AMI
53#define PCI_VENDOR_ID_AMI 0x101E
54#endif
55
56#ifndef PCI_VENDOR_ID_DELL
57#define PCI_VENDOR_ID_DELL 0x1028
58#endif
59
60#ifndef PCI_VENDOR_ID_INTEL
61#define PCI_VENDOR_ID_INTEL 0x8086
62#endif
63
64#ifndef PCI_DEVICE_ID_AMI_MEGARAID
65#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010
66#endif
67
68#ifndef PCI_DEVICE_ID_AMI_MEGARAID2
69#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
70#endif
71
72#ifndef PCI_DEVICE_ID_AMI_MEGARAID3
73#define PCI_DEVICE_ID_AMI_MEGARAID3 0x1960
74#endif
75
76#define PCI_DEVICE_ID_DISCOVERY 0x000E 48#define PCI_DEVICE_ID_DISCOVERY 0x000E
77#define PCI_DEVICE_ID_PERC4_DI 0x000F 49#define PCI_DEVICE_ID_PERC4_DI 0x000F
78#define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407 50#define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407
79 51
80/* Sub-System Vendor IDs */
81#define AMI_SUBSYS_VID 0x101E
82#define DELL_SUBSYS_VID 0x1028
83#define HP_SUBSYS_VID 0x103C
84#define LSI_SUBSYS_VID 0x1000
85#define INTEL_SUBSYS_VID 0x8086
86
87#define HBA_SIGNATURE 0x3344 52#define HBA_SIGNATURE 0x3344
88#define HBA_SIGNATURE_471 0xCCCC 53#define HBA_SIGNATURE_471 0xCCCC
89#define HBA_SIGNATURE_64BIT 0x0299 54#define HBA_SIGNATURE_64BIT 0x0299
diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c
index 88cf1db21a79..783edc7c6b98 100644
--- a/drivers/scsi/mvumi.c
+++ b/drivers/scsi/mvumi.c
@@ -122,7 +122,7 @@ static struct mvumi_res *mvumi_alloc_mem_resource(struct mvumi_hba *mhba,
122 122
123 if (!res) { 123 if (!res) {
124 dev_err(&mhba->pdev->dev, 124 dev_err(&mhba->pdev->dev,
125 "Failed to allocate memory for resouce manager.\n"); 125 "Failed to allocate memory for resource manager.\n");
126 return NULL; 126 return NULL;
127 } 127 }
128 128
@@ -1007,13 +1007,13 @@ static int mvumi_handshake(struct mvumi_hba *mhba)
1007 tmp |= INT_MAP_COMAOUT | INT_MAP_COMAERR; 1007 tmp |= INT_MAP_COMAOUT | INT_MAP_COMAERR;
1008 iowrite32(tmp, regs + CPU_ENPOINTA_MASK_REG); 1008 iowrite32(tmp, regs + CPU_ENPOINTA_MASK_REG);
1009 iowrite32(mhba->list_num_io, mhba->ib_shadow); 1009 iowrite32(mhba->list_num_io, mhba->ib_shadow);
1010 /* Set InBound List Avaliable count shadow */ 1010 /* Set InBound List Available count shadow */
1011 iowrite32(lower_32_bits(mhba->ib_shadow_phys), 1011 iowrite32(lower_32_bits(mhba->ib_shadow_phys),
1012 regs + CLA_INB_AVAL_COUNT_BASEL); 1012 regs + CLA_INB_AVAL_COUNT_BASEL);
1013 iowrite32(upper_32_bits(mhba->ib_shadow_phys), 1013 iowrite32(upper_32_bits(mhba->ib_shadow_phys),
1014 regs + CLA_INB_AVAL_COUNT_BASEH); 1014 regs + CLA_INB_AVAL_COUNT_BASEH);
1015 1015
1016 /* Set OutBound List Avaliable count shadow */ 1016 /* Set OutBound List Available count shadow */
1017 iowrite32((mhba->list_num_io-1) | CL_POINTER_TOGGLE, 1017 iowrite32((mhba->list_num_io-1) | CL_POINTER_TOGGLE,
1018 mhba->ob_shadow); 1018 mhba->ob_shadow);
1019 iowrite32(lower_32_bits(mhba->ob_shadow_phys), regs + 0x5B0); 1019 iowrite32(lower_32_bits(mhba->ob_shadow_phys), regs + 0x5B0);
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 9da426628b97..487e3c8411c9 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -803,7 +803,7 @@ static void qla4xxx_conn_get_stats(struct iscsi_cls_conn *cls_conn,
803 iscsi_stats_dma); 803 iscsi_stats_dma);
804 if (ret != QLA_SUCCESS) { 804 if (ret != QLA_SUCCESS) {
805 ql4_printk(KERN_ERR, ha, 805 ql4_printk(KERN_ERR, ha,
806 "Unable to retreive iscsi stats\n"); 806 "Unable to retrieve iscsi stats\n");
807 goto free_stats; 807 goto free_stats;
808 } 808 }
809 809
@@ -4338,7 +4338,7 @@ static int qla4xxx_compare_tuple_ddb(struct scsi_qla_host *ha,
4338 return QLA_ERROR; 4338 return QLA_ERROR;
4339 4339
4340 /* For multi sessions, driver generates the ISID, so do not compare 4340 /* For multi sessions, driver generates the ISID, so do not compare
4341 * ISID in reset path since it would be a comparision between the 4341 * ISID in reset path since it would be a comparison between the
4342 * driver generated ISID and firmware generated ISID. This could 4342 * driver generated ISID and firmware generated ISID. This could
4343 * lead to adding duplicated DDBs in the list as driver generated 4343 * lead to adding duplicated DDBs in the list as driver generated
4344 * ISID would not match firmware generated ISID. 4344 * ISID would not match firmware generated ISID.
@@ -5326,7 +5326,7 @@ static void qla4xxx_destroy_fw_ddb_session(struct scsi_qla_host *ha)
5326 } 5326 }
5327} 5327}
5328/** 5328/**
5329 * qla4xxx_remove_adapter - calback function to remove adapter. 5329 * qla4xxx_remove_adapter - callback function to remove adapter.
5330 * @pci_dev: PCI device pointer 5330 * @pci_dev: PCI device pointer
5331 **/ 5331 **/
5332static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev) 5332static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index 4411d4224401..20b3a483c2cc 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -295,7 +295,7 @@ static void ll_adapter_reset(const struct pvscsi_adapter *adapter)
295 295
296static void ll_bus_reset(const struct pvscsi_adapter *adapter) 296static void ll_bus_reset(const struct pvscsi_adapter *adapter)
297{ 297{
298 dev_dbg(pvscsi_dev(adapter), "Reseting bus on %p\n", adapter); 298 dev_dbg(pvscsi_dev(adapter), "Resetting bus on %p\n", adapter);
299 299
300 pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_RESET_BUS, NULL, 0); 300 pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_RESET_BUS, NULL, 0);
301} 301}
@@ -304,7 +304,7 @@ static void ll_device_reset(const struct pvscsi_adapter *adapter, u32 target)
304{ 304{
305 struct PVSCSICmdDescResetDevice cmd = { 0 }; 305 struct PVSCSICmdDescResetDevice cmd = { 0 };
306 306
307 dev_dbg(pvscsi_dev(adapter), "Reseting device: target=%u\n", target); 307 dev_dbg(pvscsi_dev(adapter), "Resetting device: target=%u\n", target);
308 308
309 cmd.target = target; 309 cmd.target = target;
310 310
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c
index 5784c8799616..4de66d1cfe51 100644
--- a/drivers/spi/spi-au1550.c
+++ b/drivers/spi/spi-au1550.c
@@ -475,7 +475,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
475 /* 475 /*
476 * due to an spi error we consider transfer as done, 476 * due to an spi error we consider transfer as done,
477 * so mask all events until before next transfer start 477 * so mask all events until before next transfer start
478 * and stop the possibly running dma immediatelly 478 * and stop the possibly running dma immediately
479 */ 479 */
480 au1550_spi_mask_ack_all(hw); 480 au1550_spi_mask_ack_all(hw);
481 au1xxx_dbdma_stop(hw->dma_rx_ch); 481 au1xxx_dbdma_stop(hw->dma_rx_ch);
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 1fe51198a622..6555ecd07302 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -467,7 +467,7 @@ bfin_sport_spi_pump_transfers(unsigned long data)
467 dev_dbg(drv_data->dev, "IO write error!\n"); 467 dev_dbg(drv_data->dev, "IO write error!\n");
468 drv_data->state = ERROR_STATE; 468 drv_data->state = ERROR_STATE;
469 } else { 469 } else {
470 /* Update total byte transfered */ 470 /* Update total byte transferred */
471 message->actual_length += transfer->len; 471 message->actual_length += transfer->len;
472 /* Move to next transfer of this msg */ 472 /* Move to next transfer of this msg */
473 drv_data->state = bfin_sport_spi_next_transfer(drv_data); 473 drv_data->state = bfin_sport_spi_next_transfer(drv_data);
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 698018fd992b..9d9071b730be 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -129,7 +129,7 @@ static int tiny_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
129 unsigned int i; 129 unsigned int i;
130 130
131 if (hw->irq >= 0) { 131 if (hw->irq >= 0) {
132 /* use intrrupt driven data transfer */ 132 /* use interrupt driven data transfer */
133 hw->len = t->len; 133 hw->len = t->len;
134 hw->txp = t->tx_buf; 134 hw->txp = t->tx_buf;
135 hw->rxp = t->rx_buf; 135 hw->rxp = t->rx_buf;
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 75ac9d48ef46..7a85f22b6474 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -101,7 +101,7 @@ struct spi_ppc4xx_regs {
101 u8 dummy; 101 u8 dummy;
102 /* 102 /*
103 * Clock divisor modulus register 103 * Clock divisor modulus register
104 * This uses the follwing formula: 104 * This uses the following formula:
105 * SCPClkOut = OPBCLK/(4(CDM + 1)) 105 * SCPClkOut = OPBCLK/(4(CDM + 1))
106 * or 106 * or
107 * CDM = (OPBCLK/4*SCPClkOut) - 1 107 * CDM = (OPBCLK/4*SCPClkOut) - 1
@@ -201,7 +201,7 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)
201 return -EINVAL; 201 return -EINVAL;
202 } 202 }
203 203
204 /* Write new configration */ 204 /* Write new configuration */
205 out_8(&hw->regs->mode, cs->mode); 205 out_8(&hw->regs->mode, cs->mode);
206 206
207 /* Set the clock */ 207 /* Set the clock */
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index cd56dcf46320..1284c9b74653 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -505,7 +505,7 @@ static int pch_spi_transfer(struct spi_device *pspi, struct spi_message *pmsg)
505 } 505 }
506 506
507 if (unlikely(pspi->max_speed_hz == 0)) { 507 if (unlikely(pspi->max_speed_hz == 0)) {
508 dev_err(&pspi->dev, "%s pch_spi_tranfer maxspeed=%d\n", 508 dev_err(&pspi->dev, "%s pch_spi_transfer maxspeed=%d\n",
509 __func__, pspi->max_speed_hz); 509 __func__, pspi->max_speed_hz);
510 retval = -EINVAL; 510 retval = -EINVAL;
511 goto err_out; 511 goto err_out;
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 0c4760fabfc0..240f7aa76ed1 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -662,7 +662,7 @@ int iscsi_extract_key_value(char *textbuf, char **key, char **value)
662{ 662{
663 *value = strchr(textbuf, '='); 663 *value = strchr(textbuf, '=');
664 if (!*value) { 664 if (!*value) {
665 pr_err("Unable to locate \"=\" seperator for key," 665 pr_err("Unable to locate \"=\" separator for key,"
666 " ignoring request.\n"); 666 " ignoring request.\n");
667 return -1; 667 return -1;
668 } 668 }
@@ -1269,7 +1269,7 @@ static int iscsi_check_value(struct iscsi_param *param, char *value)
1269 comma_ptr = strchr(value, ','); 1269 comma_ptr = strchr(value, ',');
1270 1270
1271 if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) { 1271 if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) {
1272 pr_err("Detected value seperator \",\", but" 1272 pr_err("Detected value separator \",\", but"
1273 " key \"%s\" does not allow a value list," 1273 " key \"%s\" does not allow a value list,"
1274 " protocol error.\n", param->name); 1274 " protocol error.\n", param->name);
1275 return -1; 1275 return -1;
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index f75da8758adc..f49181c73113 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -228,7 +228,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
228 data->port = pdata->flags; 228 data->port = pdata->flags;
229 if (data->port < 0) { 229 if (data->port < 0) {
230 dev_err(&pdev->dev, "wrong platform data is assigned"); 230 dev_err(&pdev->dev, "wrong platform data is assigned");
231 kfree(data);
232 return -EINVAL; 231 return -EINVAL;
233 } 232 }
234 233
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 4bc2b8a5dd8b..663c308d0e73 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -461,7 +461,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
461done: 461done:
462 platform_set_drvdata(pdev, dsim); 462 platform_set_drvdata(pdev, dsim);
463 463
464 dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__, 464 dev_dbg(&pdev->dev, "%s() completed successfully (%s mode)\n", __func__,
465 dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB"); 465 dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");
466 466
467 return 0; 467 return 0;
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 8e4a446b5ed1..b244f060f151 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -694,6 +694,10 @@ static int __devinit tmiofb_probe(struct platform_device *dev)
694 dev_err(&dev->dev, "NULL platform data!\n"); 694 dev_err(&dev->dev, "NULL platform data!\n");
695 return -EINVAL; 695 return -EINVAL;
696 } 696 }
697 if (ccr == NULL || lcr == NULL || vram == NULL || irq < 0) {
698 dev_err(&dev->dev, "missing resources\n");
699 return -EINVAL;
700 }
697 701
698 info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev); 702 info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev);
699 703
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 530a2d309063..7c294f4dc0ed 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -349,7 +349,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
349 "pass: %d entering ASM\n", pass); 349 "pass: %d entering ASM\n", pass);
350 ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA); 350 ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA);
351 dev_dbg(&ds1wm_data->pdev->dev, 351 dev_dbg(&ds1wm_data->pdev->dev,
352 "pass: %d begining nibble loop\n", pass); 352 "pass: %d beginning nibble loop\n", pass);
353 353
354 r_prime = 0; 354 r_prime = 0;
355 d = 0; 355 d = 0;
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 0d195b507660..9821b672f5a2 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -116,7 +116,7 @@ struct btrfs_ordered_sum;
116#define BTRFS_FREE_SPACE_OBJECTID -11ULL 116#define BTRFS_FREE_SPACE_OBJECTID -11ULL
117 117
118/* 118/*
119 * The inode number assigned to the special inode for sotring 119 * The inode number assigned to the special inode for storing
120 * free ino cache 120 * free ino cache
121 */ 121 */
122#define BTRFS_FREE_INO_OBJECTID -12ULL 122#define BTRFS_FREE_INO_OBJECTID -12ULL
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index ab5300595847..c9d703693df0 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -18,7 +18,7 @@
18#ifndef __DELAYED_REF__ 18#ifndef __DELAYED_REF__
19#define __DELAYED_REF__ 19#define __DELAYED_REF__
20 20
21/* these are the possible values of struct btrfs_delayed_ref->action */ 21/* these are the possible values of struct btrfs_delayed_ref_node->action */
22#define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */ 22#define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */
23#define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */ 23#define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */
24#define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */ 24#define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ec154f954646..316b07a866d2 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1971,8 +1971,8 @@ out:
1971 ordered_extent->len - 1, NULL, GFP_NOFS); 1971 ordered_extent->len - 1, NULL, GFP_NOFS);
1972 1972
1973 /* 1973 /*
1974 * This needs to be dont to make sure anybody waiting knows we are done 1974 * This needs to be done to make sure anybody waiting knows we are done
1975 * upating everything for this ordered extent. 1975 * updating everything for this ordered extent.
1976 */ 1976 */
1977 btrfs_remove_ordered_extent(inode, ordered_extent); 1977 btrfs_remove_ordered_extent(inode, ordered_extent);
1978 1978
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 376aa77f3ca7..2616d0ea5c5c 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -479,7 +479,7 @@ void ext2_discard_reservation(struct inode *inode)
479/** 479/**
480 * ext2_free_blocks() -- Free given blocks and update quota and i_blocks 480 * ext2_free_blocks() -- Free given blocks and update quota and i_blocks
481 * @inode: inode 481 * @inode: inode
482 * @block: start physcial block to free 482 * @block: start physical block to free
483 * @count: number of blocks to free 483 * @count: number of blocks to free
484 */ 484 */
485void ext2_free_blocks (struct inode * inode, unsigned long block, 485void ext2_free_blocks (struct inode * inode, unsigned long block,
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 90d901f0486b..7320a66e958f 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -483,7 +483,7 @@ void ext3_discard_reservation(struct inode *inode)
483 * ext3_free_blocks_sb() -- Free given blocks and update quota 483 * ext3_free_blocks_sb() -- Free given blocks and update quota
484 * @handle: handle to this transaction 484 * @handle: handle to this transaction
485 * @sb: super block 485 * @sb: super block
486 * @block: start physcial block to free 486 * @block: start physical block to free
487 * @count: number of blocks to free 487 * @count: number of blocks to free
488 * @pdquot_freed_blocks: pointer to quota 488 * @pdquot_freed_blocks: pointer to quota
489 */ 489 */
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index ff574b4e345e..7e87e37a372a 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -3207,7 +3207,7 @@ out_brelse:
3207 * 3207 *
3208 * - Within generic_file_write() for O_SYNC files. 3208 * - Within generic_file_write() for O_SYNC files.
3209 * Here, there will be no transaction running. We wait for any running 3209 * Here, there will be no transaction running. We wait for any running
3210 * trasnaction to commit. 3210 * transaction to commit.
3211 * 3211 *
3212 * - Within sys_sync(), kupdate and such. 3212 * - Within sys_sync(), kupdate and such.
3213 * We wait on commit, if tol to. 3213 * We wait on commit, if tol to.
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index dff171c3a123..c862ee5fe79d 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3313,7 +3313,7 @@ int ext4_discard_partial_page_buffers(handle_t *handle,
3313 * handle: The journal handle 3313 * handle: The journal handle
3314 * inode: The files inode 3314 * inode: The files inode
3315 * page: A locked page that contains the offset "from" 3315 * page: A locked page that contains the offset "from"
3316 * from: The starting byte offset (from the begining of the file) 3316 * from: The starting byte offset (from the beginning of the file)
3317 * to begin discarding 3317 * to begin discarding
3318 * len: The length of bytes to discard 3318 * len: The length of bytes to discard
3319 * flags: Optional flags that may be used: 3319 * flags: Optional flags that may be used:
@@ -3321,11 +3321,11 @@ int ext4_discard_partial_page_buffers(handle_t *handle,
3321 * EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED 3321 * EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED
3322 * Only zero the regions of the page whose buffer heads 3322 * Only zero the regions of the page whose buffer heads
3323 * have already been unmapped. This flag is appropriate 3323 * have already been unmapped. This flag is appropriate
3324 * for updateing the contents of a page whose blocks may 3324 * for updating the contents of a page whose blocks may
3325 * have already been released, and we only want to zero 3325 * have already been released, and we only want to zero
3326 * out the regions that correspond to those released blocks. 3326 * out the regions that correspond to those released blocks.
3327 * 3327 *
3328 * Returns zero on sucess or negative on failure. 3328 * Returns zero on success or negative on failure.
3329 */ 3329 */
3330static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, 3330static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,
3331 struct inode *inode, struct page *page, loff_t from, 3331 struct inode *inode, struct page *page, loff_t from,
@@ -3486,7 +3486,7 @@ int ext4_can_truncate(struct inode *inode)
3486 * @offset: The offset where the hole will begin 3486 * @offset: The offset where the hole will begin
3487 * @len: The length of the hole 3487 * @len: The length of the hole
3488 * 3488 *
3489 * Returns: 0 on sucess or negative on failure 3489 * Returns: 0 on success or negative on failure
3490 */ 3490 */
3491 3491
3492int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) 3492int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
@@ -4008,7 +4008,7 @@ static int ext4_inode_blocks_set(handle_t *handle,
4008 4008
4009 if (i_blocks <= ~0U) { 4009 if (i_blocks <= ~0U) {
4010 /* 4010 /*
4011 * i_blocks can be represnted in a 32 bit variable 4011 * i_blocks can be represented in a 32 bit variable
4012 * as multiple of 512 bytes 4012 * as multiple of 512 bytes
4013 */ 4013 */
4014 raw_inode->i_blocks_lo = cpu_to_le32(i_blocks); 4014 raw_inode->i_blocks_lo = cpu_to_le32(i_blocks);
@@ -4169,7 +4169,7 @@ out_brelse:
4169 * 4169 *
4170 * - Within generic_file_write() for O_SYNC files. 4170 * - Within generic_file_write() for O_SYNC files.
4171 * Here, there will be no transaction running. We wait for any running 4171 * Here, there will be no transaction running. We wait for any running
4172 * trasnaction to commit. 4172 * transaction to commit.
4173 * 4173 *
4174 * - Within sys_sync(), kupdate and such. 4174 * - Within sys_sync(), kupdate and such.
4175 * We wait on commit, if tol to. 4175 * We wait on commit, if tol to.
@@ -4413,7 +4413,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk)
4413 * worse case, the indexs blocks spread over different block groups 4413 * worse case, the indexs blocks spread over different block groups
4414 * 4414 *
4415 * If datablocks are discontiguous, they are possible to spread over 4415 * If datablocks are discontiguous, they are possible to spread over
4416 * different block groups too. If they are contiuguous, with flexbg, 4416 * different block groups too. If they are contiguous, with flexbg,
4417 * they could still across block group boundary. 4417 * they could still across block group boundary.
4418 * 4418 *
4419 * Also account for superblock, inode, quota and xattr blocks 4419 * Also account for superblock, inode, quota and xattr blocks
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 8eae94771c45..08778f6cdfe9 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -4709,7 +4709,7 @@ error_return:
4709 * ext4_group_add_blocks() -- Add given blocks to an existing group 4709 * ext4_group_add_blocks() -- Add given blocks to an existing group
4710 * @handle: handle to this transaction 4710 * @handle: handle to this transaction
4711 * @sb: super block 4711 * @sb: super block
4712 * @block: start physcial block to add to the block group 4712 * @block: start physical block to add to the block group
4713 * @count: number of blocks to free 4713 * @count: number of blocks to free
4714 * 4714 *
4715 * This marks the blocks as free in the bitmap and buddy. 4715 * This marks the blocks as free in the bitmap and buddy.
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index be3efc4f64f4..6d46c0d78338 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -577,10 +577,6 @@ static long writeback_chunk_size(struct backing_dev_info *bdi,
577/* 577/*
578 * Write a portion of b_io inodes which belong to @sb. 578 * Write a portion of b_io inodes which belong to @sb.
579 * 579 *
580 * If @only_this_sb is true, then find and write all such
581 * inodes. Otherwise write only ones which go sequentially
582 * in reverse order.
583 *
584 * Return the number of pages and/or inodes written. 580 * Return the number of pages and/or inodes written.
585 */ 581 */
586static long writeback_sb_inodes(struct super_block *sb, 582static long writeback_sb_inodes(struct super_block *sb,
diff --git a/fs/libfs.c b/fs/libfs.c
index a74cb1725ac6..7cc37ca19cd8 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -874,7 +874,7 @@ struct dentry *generic_fh_to_dentry(struct super_block *sb, struct fid *fid,
874EXPORT_SYMBOL_GPL(generic_fh_to_dentry); 874EXPORT_SYMBOL_GPL(generic_fh_to_dentry);
875 875
876/** 876/**
877 * generic_fh_to_dentry - generic helper for the fh_to_parent export operation 877 * generic_fh_to_parent - generic helper for the fh_to_parent export operation
878 * @sb: filesystem to do the file handle conversion on 878 * @sb: filesystem to do the file handle conversion on
879 * @fid: file handle to convert 879 * @fid: file handle to convert
880 * @fh_len: length of the file handle in bytes 880 * @fh_len: length of the file handle in bytes
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b8eda700584b..d2c7f5db0847 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1537,7 +1537,7 @@ static int nfs_parse_mount_options(char *raw,
1537 1537
1538 /* 1538 /*
1539 * verify that any proto=/mountproto= options match the address 1539 * verify that any proto=/mountproto= options match the address
1540 * familiies in the addr=/mountaddr= options. 1540 * families in the addr=/mountaddr= options.
1541 */ 1541 */
1542 if (protofamily != AF_UNSPEC && 1542 if (protofamily != AF_UNSPEC &&
1543 protofamily != mnt->nfs_server.address.ss_family) 1543 protofamily != mnt->nfs_server.address.ss_family)
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index 9a323d12de1c..0ba014c55056 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -10,12 +10,10 @@
10 10
11struct irq_affinity_notify; 11struct irq_affinity_notify;
12struct proc_dir_entry; 12struct proc_dir_entry;
13struct timer_rand_state;
14struct module; 13struct module;
15/** 14/**
16 * struct irq_desc - interrupt descriptor 15 * struct irq_desc - interrupt descriptor
17 * @irq_data: per irq and chip data passed down to chip functions 16 * @irq_data: per irq and chip data passed down to chip functions
18 * @timer_rand_state: pointer to timer rand state struct
19 * @kstat_irqs: irq stats per cpu 17 * @kstat_irqs: irq stats per cpu
20 * @handle_irq: highlevel irq-events handler 18 * @handle_irq: highlevel irq-events handler
21 * @preflow_handler: handler called before the flow handler (currently used by sparc) 19 * @preflow_handler: handler called before the flow handler (currently used by sparc)
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index f4f0dfa4698a..6823548d0c0a 100644
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -67,7 +67,7 @@ struct max8998_regulator_data {
67/** 67/**
68 * struct max8998_board - packages regulator init data 68 * struct max8998_board - packages regulator init data
69 * @regulators: array of defined regulators 69 * @regulators: array of defined regulators
70 * @num_regulators: number of regultors used 70 * @num_regulators: number of regulators used
71 * @irq_base: base IRQ number for max8998, required for IRQs 71 * @irq_base: base IRQ number for max8998, required for IRQs
72 * @ono: power onoff IRQ number for max8998 72 * @ono: power onoff IRQ number for max8998
73 * @buck_voltage_lock: Do NOT change the values of the following six 73 * @buck_voltage_lock: Do NOT change the values of the following six
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index b0b4eb24d592..1905ca8dd399 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Trace files that want to automate creationg of all tracepoints defined 2 * Trace files that want to automate creation of all tracepoints defined
3 * in their file should include this file. The following are macros that the 3 * in their file should include this file. The following are macros that the
4 * trace file may define: 4 * trace file may define:
5 * 5 *
diff --git a/mm/bootmem.c b/mm/bootmem.c
index bcb63ac48cc5..f468185b3b28 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -419,7 +419,7 @@ int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
419} 419}
420 420
421/** 421/**
422 * reserve_bootmem - mark a page range as usable 422 * reserve_bootmem - mark a page range as reserved
423 * @addr: starting address of the range 423 * @addr: starting address of the range
424 * @size: size of the range in bytes 424 * @size: size of the range in bytes
425 * @flags: reservation flags (see linux/bootmem.h) 425 * @flags: reservation flags (see linux/bootmem.h)
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index c718fd3664b6..4de77ea5fa37 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -105,7 +105,7 @@ static const struct file_operations vlandev_fops = {
105}; 105};
106 106
107/* 107/*
108 * Proc filesystem derectory entries. 108 * Proc filesystem directory entries.
109 */ 109 */
110 110
111/* Strings */ 111/* Strings */
diff --git a/scripts/coccinelle/api/memdup_user.cocci b/scripts/coccinelle/api/memdup_user.cocci
index 2efac289fd59..2b131a8a1306 100644
--- a/scripts/coccinelle/api/memdup_user.cocci
+++ b/scripts/coccinelle/api/memdup_user.cocci
@@ -51,10 +51,10 @@ statement S1,S2;
51p << r.p; 51p << r.p;
52@@ 52@@
53 53
54coccilib.org.print_todo(p[0], "WARNING opportunity for memdep_user") 54coccilib.org.print_todo(p[0], "WARNING opportunity for memdup_user")
55 55
56@script:python depends on report@ 56@script:python depends on report@
57p << r.p; 57p << r.p;
58@@ 58@@
59 59
60coccilib.report.print_report(p[0], "WARNING opportunity for memdep_user") 60coccilib.report.print_report(p[0], "WARNING opportunity for memdup_user")
diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore
index 4d995aeaebc0..9cdec70d72b8 100644
--- a/security/apparmor/.gitignore
+++ b/security/apparmor/.gitignore
@@ -1,6 +1,5 @@
1# 1#
2# Generated include files 2# Generated include files
3# 3#
4af_names.h
5capability_names.h 4capability_names.h
6rlim_names.h 5rlim_names.h
diff --git a/sound/oss/.gitignore b/sound/oss/.gitignore
index 7efb12b45502..12a3920d6fb6 100644
--- a/sound/oss/.gitignore
+++ b/sound/oss/.gitignore
@@ -1,4 +1,3 @@
1#Ignore generated files 1#Ignore generated files
2maui_boot.h
3pss_boot.h 2pss_boot.h
4trix_boot.h 3trix_boot.h
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 3bdb407f9cd9..eb340571e7d6 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -58,7 +58,7 @@ struct callchain_list {
58/* 58/*
59 * A callchain cursor is a single linked list that 59 * A callchain cursor is a single linked list that
60 * let one feed a callchain progressively. 60 * let one feed a callchain progressively.
61 * It keeps persitent allocated entries to minimize 61 * It keeps persistent allocated entries to minimize
62 * allocations. 62 * allocations.
63 */ 63 */
64struct callchain_cursor_node { 64struct callchain_cursor_node {
diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c
index 127d648cc548..607dd290b319 100644
--- a/tools/perf/util/parse-events-test.c
+++ b/tools/perf/util/parse-events-test.c
@@ -752,7 +752,7 @@ static int test_pmu(void)
752 752
753 ret = stat(path, &st); 753 ret = stat(path, &st);
754 if (ret) 754 if (ret)
755 pr_debug("ommiting PMU cpu tests\n"); 755 pr_debug("omitting PMU cpu tests\n");
756 return !ret; 756 return !ret;
757} 757}
758 758
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index 213362850abd..c40c2d33199e 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -1,5 +1,5 @@
1# 1#
2# List of files needed by perf python extention 2# List of files needed by perf python extension
3# 3#
4# Each source file must be placed on its own line so that it can be 4# Each source file must be placed on its own line so that it can be
5# processed by Makefile and util/setup.py accordingly. 5# processed by Makefile and util/setup.py accordingly.
diff --git a/tools/testing/ktest/examples/include/defaults.conf b/tools/testing/ktest/examples/include/defaults.conf
index 323a552ce642..63a1a83f4f0b 100644
--- a/tools/testing/ktest/examples/include/defaults.conf
+++ b/tools/testing/ktest/examples/include/defaults.conf
@@ -33,7 +33,7 @@ DEFAULTS
33THIS_DIR := ${PWD} 33THIS_DIR := ${PWD}
34 34
35 35
36# to orginize your configs, having each machine save their configs 36# to organize your configs, having each machine save their configs
37# into a separate directly is useful. 37# into a separate directly is useful.
38CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE} 38CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE}
39 39
diff --git a/tools/testing/ktest/examples/include/tests.conf b/tools/testing/ktest/examples/include/tests.conf
index 4fdb811bd810..60cedb1a1154 100644
--- a/tools/testing/ktest/examples/include/tests.conf
+++ b/tools/testing/ktest/examples/include/tests.conf
@@ -47,7 +47,7 @@ BUILD_NOCLEAN = 1
47# Build, install, boot and test with a randconfg 10 times. 47# Build, install, boot and test with a randconfg 10 times.
48# It is important that you have set MIN_CONFIG in the config 48# It is important that you have set MIN_CONFIG in the config
49# that includes this file otherwise it is likely that the 49# that includes this file otherwise it is likely that the
50# randconfig will not have the neccessary configs needed to 50# randconfig will not have the necessary configs needed to
51# boot your box. This version of the test requires a min 51# boot your box. This version of the test requires a min
52# config that has enough to make sure the target has network 52# config that has enough to make sure the target has network
53# working. 53# working.
diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests
index 8b40bd5e5cc2..4c53cae6c273 100644
--- a/tools/testing/selftests/vm/run_vmtests
+++ b/tools/testing/selftests/vm/run_vmtests
@@ -36,7 +36,7 @@ mkdir $mnt
36mount -t hugetlbfs none $mnt 36mount -t hugetlbfs none $mnt
37 37
38echo "--------------------" 38echo "--------------------"
39echo "runing hugepage-mmap" 39echo "running hugepage-mmap"
40echo "--------------------" 40echo "--------------------"
41./hugepage-mmap 41./hugepage-mmap
42if [ $? -ne 0 ]; then 42if [ $? -ne 0 ]; then
@@ -50,7 +50,7 @@ shmall=`cat /proc/sys/kernel/shmall`
50echo 268435456 > /proc/sys/kernel/shmmax 50echo 268435456 > /proc/sys/kernel/shmmax
51echo 4194304 > /proc/sys/kernel/shmall 51echo 4194304 > /proc/sys/kernel/shmall
52echo "--------------------" 52echo "--------------------"
53echo "runing hugepage-shm" 53echo "running hugepage-shm"
54echo "--------------------" 54echo "--------------------"
55./hugepage-shm 55./hugepage-shm
56if [ $? -ne 0 ]; then 56if [ $? -ne 0 ]; then
@@ -62,7 +62,7 @@ echo $shmmax > /proc/sys/kernel/shmmax
62echo $shmall > /proc/sys/kernel/shmall 62echo $shmall > /proc/sys/kernel/shmall
63 63
64echo "--------------------" 64echo "--------------------"
65echo "runing map_hugetlb" 65echo "running map_hugetlb"
66echo "--------------------" 66echo "--------------------"
67./map_hugetlb 67./map_hugetlb
68if [ $? -ne 0 ]; then 68if [ $? -ne 0 ]; then