leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse Source 
Pull the trivial tree from Jiri Kosina:
 "Tiny usual fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  doc: fix old config name of kprobetrace
  fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
  btrfs: fix the commment for the action flags in delayed-ref.h
  btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
  vfs: fix kerneldoc for generic_fh_to_parent()
  treewide: fix comment/printk/variable typos
  ipr: fix small coding style issues
  doc: fix broken utf8 encoding
  nfs: comment fix
  platform/x86: fix asus_laptop.wled_type module parameter
  mfd: printk/comment fixes
  doc: getdelays.c: remember to close() socket on error in create_nl_socket()
  doc: aliasing-test: close fd on write error
  mmc: fix comment typos
  dma: fix comments
  spi: fix comment/printk typos in spi
  Coccinelle: fix typo in memdup_user.cocci
  tmiofb: missing NULL pointer checks
  tools: perf: Fix typo in tools/perf
  tools/testing: fix comment / output typos
  ...
This commit is contained in:
Linus Torvalds 2012-10-01 09:06:36 -07:00
commit 99dbb1632f
87 changed files with 142 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/accounting/getdelays.c
View File

@ -98,10 +98,9 @@ static int create_nl_socket(int protocol)
if (rcvbufsz) if (rcvbufsz)
if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
&rcvbufsz, sizeof(rcvbufsz)) < 0) { &rcvbufsz, sizeof(rcvbufsz)) < 0) {
fprintf(stderr, "Unable to set socket rcv buf size " fprintf(stderr, "Unable to set socket rcv buf size to %d\n",
"to %d\n",
rcvbufsz); rcvbufsz);
return -1; goto error;
} }
memset(&local, 0, sizeof(local)); memset(&local, 0, sizeof(local));

1
Documentation/dontdiff
View File

@ -162,7 +162,6 @@ mach-types.h
machtypes.h machtypes.h
map map
map_hugetlb map_hugetlb
maui_boot.h
media media
mconf mconf
miboot* miboot*

1
Documentation/ia64/aliasing-test.c
View File

@ -132,6 +132,7 @@ static int read_rom(char *path)
rc = write(fd, "1", 2); rc = write(fd, "1", 2);
if (rc <= 0) { if (rc <= 0) {
close(fd);
perror("write"); perror("write");
return -1; return -1;
} }

2
Documentation/power/swsusp.txt
View File

@ -53,7 +53,7 @@ before suspend (it is limited to 500 MB by default).
Article about goals and implementation of Software Suspend for Linux Article about goals and implementation of Software Suspend for Linux
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Author: G‚ábor Kuti Author: Gábor Kuti
Last revised: 2003-10-20 by Pavel Machek Last revised: 2003-10-20 by Pavel Machek
Idea and goals to achieve Idea and goals to achieve

2
Documentation/trace/kprobetrace.txt
View File

@ -12,7 +12,7 @@ kprobes can probe (this means, all functions body except for __kprobes
functions). Unlike the Tracepoint based event, this can be added and removed functions). Unlike the Tracepoint based event, this can be added and removed
dynamically, on the fly. dynamically, on the fly.
To enable this feature, build your kernel with CONFIG_KPROBE_TRACING=y. To enable this feature, build your kernel with CONFIG_KPROBE_EVENT=y.
Similar to the events tracer, this doesn't need to be activated via Similar to the events tracer, this doesn't need to be activated via
current_tracer. Instead of that, add probe points via current_tracer. Instead of that, add probe points via

4
arch/powerpc/boot/.gitignore vendored
View File

@ -1,10 +1,6 @@
addnote addnote
empty.c empty.c
hack-coff hack-coff
infblock.c
infblock.h
infcodes.c
infcodes.h
inffast.c inffast.c
inffast.h inffast.h
inffixed.h inffixed.h

2
arch/x86/include/asm/hpet.h
View File

@ -35,8 +35,6 @@
#define HPET_ID_NUMBER_SHIFT 8 #define HPET_ID_NUMBER_SHIFT 8
#define HPET_ID_VENDOR_SHIFT 16 #define HPET_ID_VENDOR_SHIFT 16
#define HPET_ID_VENDOR_8086 0x8086
#define HPET_CFG_ENABLE 0x001 #define HPET_CFG_ENABLE 0x001
#define HPET_CFG_LEGACY 0x002 #define HPET_CFG_LEGACY 0x002
#define HPET_LEGACY_8254 2 #define HPET_LEGACY_8254 2

8
drivers/dma/at_hdmac.c
View File

@ -168,9 +168,9 @@ static void atc_desc_put(struct at_dma_chan *atchan, struct at_desc *desc)
} }
/** /**
* atc_desc_chain - build chain adding a descripor * atc_desc_chain - build chain adding a descriptor
* @first: address of first descripor of the chain * @first: address of first descriptor of the chain
* @prev: address of previous descripor of the chain * @prev: address of previous descriptor of the chain
* @desc: descriptor to queue * @desc: descriptor to queue
* *
* Called from prep_* functions * Called from prep_* functions
@ -796,7 +796,7 @@ err_out:
} }
/** /**
* atc_dma_cyclic_fill_desc - Fill one period decriptor * atc_dma_cyclic_fill_desc - Fill one period descriptor
*/ */
static int static int
atc_dma_cyclic_fill_desc(struct dma_chan *chan, struct at_desc *desc, atc_dma_cyclic_fill_desc(struct dma_chan *chan, struct at_desc *desc,

2
drivers/dma/ep93xx_dma.c
View File

@ -1118,7 +1118,7 @@ fail:
* @chan: channel * @chan: channel
* @dma_addr: DMA mapped address of the buffer * @dma_addr: DMA mapped address of the buffer
* @buf_len: length of the buffer (in bytes) * @buf_len: length of the buffer (in bytes)
* @period_len: lenght of a single period * @period_len: length of a single period
* @dir: direction of the operation * @dir: direction of the operation
* @context: operation context (ignored) * @context: operation context (ignored)
* *

2
drivers/dma/fsldma.c
View File

@ -1015,7 +1015,7 @@ static irqreturn_t fsldma_chan_irq(int irq, void *data)
/* /*
* Programming Error * Programming Error
* The DMA_INTERRUPT async_tx is a NULL transfer, which will * The DMA_INTERRUPT async_tx is a NULL transfer, which will
* triger a PE interrupt. * trigger a PE interrupt.
*/ */
if (stat & FSL_DMA_SR_PE) { if (stat & FSL_DMA_SR_PE) {
chan_dbg(chan, "irq: Programming Error INT\n"); chan_dbg(chan, "irq: Programming Error INT\n");

4
drivers/dma/imx-dma.c
View File

@ -572,8 +572,8 @@ static void imxdma_tasklet(unsigned long data)
if (desc->desc.callback) if (desc->desc.callback)
desc->desc.callback(desc->desc.callback_param); desc->desc.callback(desc->desc.callback_param);
/* If we are dealing with a cyclic descriptor keep it on ld_active /* If we are dealing with a cyclic descriptor, keep it on ld_active
* and dont mark the descripor as complete. * and dont mark the descriptor as complete.
* Only in non-cyclic cases it would be marked as complete * Only in non-cyclic cases it would be marked as complete
*/ */
if (imxdma_chan_is_doing_cyclic(imxdmac)) if (imxdma_chan_is_doing_cyclic(imxdmac))

2
drivers/dma/intel_mid_dma.c
View File

@ -427,7 +427,7 @@ DMA engine callback Functions*/
* intel_mid_dma_tx_submit - callback to submit DMA transaction * intel_mid_dma_tx_submit - callback to submit DMA transaction
* @tx: dma engine descriptor * @tx: dma engine descriptor
* *
* Submit the DMA trasaction for this descriptor, start if ch idle * Submit the DMA transaction for this descriptor, start if ch idle
*/ */
static dma_cookie_t intel_mid_dma_tx_submit(struct dma_async_tx_descriptor *tx) static dma_cookie_t intel_mid_dma_tx_submit(struct dma_async_tx_descriptor *tx)
{ {

6
drivers/dma/intel_mid_dma_regs.h
View File

@ -168,9 +168,9 @@ union intel_mid_dma_cfg_hi {
* @active_list: current active descriptors * @active_list: current active descriptors
* @queue: current queued up descriptors * @queue: current queued up descriptors
* @free_list: current free descriptors * @free_list: current free descriptors
* @slave: dma slave struture * @slave: dma slave structure
* @descs_allocated: total number of decsiptors allocated * @descs_allocated: total number of descriptors allocated
* @dma: dma device struture pointer * @dma: dma device structure pointer
* @busy: bool representing if ch is busy (active txn) or not * @busy: bool representing if ch is busy (active txn) or not
* @in_use: bool representing if ch is in use or not * @in_use: bool representing if ch is in use or not
* @raw_tfr: raw trf interrupt received * @raw_tfr: raw trf interrupt received

4
drivers/dma/ioat/hw.h
View File

@ -22,7 +22,6 @@
#define _IOAT_HW_H_ #define _IOAT_HW_H_
/* PCI Configuration Space Values */ /* PCI Configuration Space Values */
#define IOAT_PCI_VID 0x8086
#define IOAT_MMIO_BAR 0 #define IOAT_MMIO_BAR 0
/* CB device ID's */ /* CB device ID's */
@ -31,9 +30,6 @@
#define IOAT_PCI_DID_SCNB 0x65FF #define IOAT_PCI_DID_SCNB 0x65FF
#define IOAT_PCI_DID_SNB 0x402F #define IOAT_PCI_DID_SNB 0x402F
#define IOAT_PCI_RID 0x00
#define IOAT_PCI_SVID 0x8086
#define IOAT_PCI_SID 0x8086
#define IOAT_VER_1_2 0x12 /* Version 1.2 */ #define IOAT_VER_1_2 0x12 /* Version 1.2 */
#define IOAT_VER_2_0 0x20 /* Version 2.0 */ #define IOAT_VER_2_0 0x20 /* Version 2.0 */
#define IOAT_VER_3_0 0x30 /* Version 3.0 */ #define IOAT_VER_3_0 0x30 /* Version 3.0 */

2
drivers/dma/pl330.c
View File

@ -522,7 +522,7 @@ enum desc_status {
/* In the DMAC pool */ /* In the DMAC pool */
FREE, FREE,
/* /*
* Allocted to some channel during prep_xxx * Allocated to some channel during prep_xxx
* Also may be sitting on the work_list. * Also may be sitting on the work_list.
*/ */
PREP, PREP,

2
drivers/dma/ppc4xx/adma.c
View File

@ -4446,7 +4446,7 @@ static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev)
ret = -ENOMEM; ret = -ENOMEM;
goto err_dma_alloc; goto err_dma_alloc;
} }
dev_dbg(&ofdev->dev, "allocted descriptor pool virt 0x%p phys 0x%llx\n", dev_dbg(&ofdev->dev, "allocated descriptor pool virt 0x%p phys 0x%llx\n",
adev->dma_desc_pool_virt, (u64)adev->dma_desc_pool); adev->dma_desc_pool_virt, (u64)adev->dma_desc_pool);
regs = ioremap(res.start, resource_size(&res)); regs = ioremap(res.start, resource_size(&res));

2
drivers/dma/ste_dma40_ll.h
View File

@ -202,7 +202,7 @@
/* LLI related structures */ /* LLI related structures */
/** /**
* struct d40_phy_lli - The basic configration register for each physical * struct d40_phy_lli - The basic configuration register for each physical
* channel. * channel.
* *
* @reg_cfg: The configuration register. * @reg_cfg: The configuration register.

2
drivers/mfd/ab8500-gpadc.c
View File

@ -342,7 +342,7 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
/* /*
* Delay might be needed for ABB8500 cut 3.0, if not, remove * Delay might be needed for ABB8500 cut 3.0, if not, remove
* when hardware will be availible * when hardware will be available
*/ */
msleep(1); msleep(1);
break; break;

2
drivers/mfd/rc5t583.c
View File

@ -281,7 +281,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
if (i2c->irq) { if (i2c->irq) {
ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base); ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
/* Still continue with waring if irq init fails */ /* Still continue with warning, if irq init fails */
if (ret) if (ret)
dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret); dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret);
else else

2
drivers/mfd/rdc321x-southbridge.c
View File

@ -1,5 +1,5 @@
/* /*
* RDC321x MFD southbrige driver * RDC321x MFD southbridge driver
* *
* Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org> * Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
* Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com> * Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com>

2
drivers/mfd/tps65911-comparator.c
View File

@ -136,7 +136,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev)
ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold); ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "cannot set COMP2 theshold\n"); dev_err(&pdev->dev, "cannot set COMP2 threshold\n");
return ret; return ret;
} }

2
drivers/mmc/core/sdio.c
View File

@ -641,7 +641,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
/* /*
* If the host and card support UHS-I mode request the card * If the host and card support UHS-I mode request the card
* to switch to 1.8V signaling level. No 1.8v signalling if * to switch to 1.8V signaling level. No 1.8v signalling if
* UHS mode is not enabled to maintain compatibilty and some * UHS mode is not enabled to maintain compatibility and some
* systems that claim 1.8v signalling in fact do not support * systems that claim 1.8v signalling in fact do not support
* it. * it.
*/ */

2
drivers/mmc/host/at91_mci.c
View File

@ -356,7 +356,7 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
} }
/* /*
* Update bytes tranfered count during a write operation * Update bytes transfered count during a write operation
*/ */
static void at91_mci_update_bytes_xfered(struct at91mci_host *host) static void at91_mci_update_bytes_xfered(struct at91mci_host *host)
{ {

2
drivers/mmc/host/atmel-mci.c
View File

@ -1022,7 +1022,7 @@ static void atmci_stop_transfer(struct atmel_mci *host)
} }
/* /*
* Stop data transfer because error(s) occured. * Stop data transfer because error(s) occurred.
*/ */
static void atmci_stop_transfer_pdc(struct atmel_mci *host) static void atmci_stop_transfer_pdc(struct atmel_mci *host)
{ {

2
drivers/mmc/host/omap_hsmmc.c
View File

@ -447,7 +447,7 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
OMAP_HSMMC_WRITE(host->base, SYSCTL, OMAP_HSMMC_WRITE(host->base, SYSCTL,
OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN); OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN);
if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0) if ((OMAP_HSMMC_READ(host->base, SYSCTL) & CEN) != 0x0)
dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n"); dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stopped\n");
} }
static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host, static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,

2
drivers/mmc/host/sdhci-esdhc-imx.c
View File

@ -315,7 +315,7 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
new_val = val & (SDHCI_CTRL_LED | \ new_val = val & (SDHCI_CTRL_LED | \
SDHCI_CTRL_4BITBUS | \ SDHCI_CTRL_4BITBUS | \
SDHCI_CTRL_D3CD); SDHCI_CTRL_D3CD);
/* ensure the endianess */ /* ensure the endianness */
new_val |= ESDHC_HOST_CONTROL_LE; new_val |= ESDHC_HOST_CONTROL_LE;
/* bits 8&9 are reserved on mx25 */ /* bits 8&9 are reserved on mx25 */
if (!is_imx25_esdhc(imx_data)) { if (!is_imx25_esdhc(imx_data)) {

2
drivers/mmc/host/vub300.c
View File

@ -806,7 +806,7 @@ static void command_res_completed(struct urb *urb)
* we suspect a buggy USB host controller * we suspect a buggy USB host controller
*/ */
} else if (!vub300->data) { } else if (!vub300->data) {
/* this means that the command (typically CMD52) suceeded */ /* this means that the command (typically CMD52) succeeded */
} else if (vub300->resp.common.header_type != 0x02) { } else if (vub300->resp.common.header_type != 0x02) {
/* /*
* this is an error response from the VUB300 chip * this is an error response from the VUB300 chip

2
drivers/net/ethernet/3com/typhoon.c
View File

@ -364,7 +364,7 @@ typhoon_inc_rxfree_index(u32 *index, const int count)
static inline void static inline void
typhoon_inc_tx_index(u32 *index, const int count) typhoon_inc_tx_index(u32 *index, const int count)
{ {
/* if we start using the Hi Tx ring, this needs updateing */ /* if we start using the Hi Tx ring, this needs updating */
typhoon_inc_index(index, count, TXLO_ENTRIES); typhoon_inc_index(index, count, TXLO_ENTRIES);
} }

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
View File

@ -1458,7 +1458,7 @@ struct bnx2x {
int fw_stats_req_sz; int fw_stats_req_sz;
/* /*
* FW statistics data shortcut (points at the begining of * FW statistics data shortcut (points at the beginning of
* fw_stats buffer + fw_stats_req_sz). * fw_stats buffer + fw_stats_req_sz).
*/ */
struct bnx2x_fw_stats_data *fw_stats_data; struct bnx2x_fw_stats_data *fw_stats_data;

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
View File

@ -1321,7 +1321,7 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,
* the current command will be enqueued to the tail of the * the current command will be enqueued to the tail of the
* pending commands list. * pending commands list.
* *
* Return: 0 is operation was sucessfull and there are no pending completions, * Return: 0 is operation was successfull and there are no pending completions,
* negative if there were errors, positive if there are pending * negative if there were errors, positive if there are pending
* completions. * completions.
*/ */

4
drivers/net/wireless/b43/Kconfig
View File

@ -34,8 +34,8 @@ config B43_BCMA
config B43_BCMA_EXTRA config B43_BCMA_EXTRA
bool "Hardware support that overlaps with the brcmsmac driver" bool "Hardware support that overlaps with the brcmsmac driver"
depends on B43_BCMA depends on B43_BCMA
default n if BRCMSMAC || BRCMSMAC_MODULE default n if BRCMSMAC
default y default y
config B43_SSB config B43_SSB
bool bool

6
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
View File

@ -315,7 +315,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
u16 box_reg = 0, box_extreg = 0; u16 box_reg = 0, box_extreg = 0;
u8 u1b_tmp; u8 u1b_tmp;
bool isfw_read = false; bool isfw_read = false;
bool bwrite_sucess = false; bool bwrite_success = false;
u8 wait_h2c_limmit = 100; u8 wait_h2c_limmit = 100;
u8 wait_writeh2c_limmit = 100; u8 wait_writeh2c_limmit = 100;
u8 boxcontent[4], boxextcontent[2]; u8 boxcontent[4], boxextcontent[2];
@ -354,7 +354,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
} }
} }
while (!bwrite_sucess) { while (!bwrite_success) {
wait_writeh2c_limmit--; wait_writeh2c_limmit--;
if (wait_writeh2c_limmit == 0) { if (wait_writeh2c_limmit == 0) {
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@ -491,7 +491,7 @@ static void _rtl92c_fill_h2c_command(struct ieee80211_hw *hw,
break; break;
} }
bwrite_sucess = true; bwrite_success = true;
rtlhal->last_hmeboxnum = boxnum + 1; rtlhal->last_hmeboxnum = boxnum + 1;
if (rtlhal->last_hmeboxnum == 4) if (rtlhal->last_hmeboxnum == 4)

6
drivers/net/wireless/rtlwifi/rtl8192de/fw.c
View File

@ -365,7 +365,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
u8 u1b_tmp; u8 u1b_tmp;
bool isfw_read = false; bool isfw_read = false;
u8 buf_index = 0; u8 buf_index = 0;
bool bwrite_sucess = false; bool bwrite_success = false;
u8 wait_h2c_limmit = 100; u8 wait_h2c_limmit = 100;
u8 wait_writeh2c_limmit = 100; u8 wait_writeh2c_limmit = 100;
u8 boxcontent[4], boxextcontent[2]; u8 boxcontent[4], boxextcontent[2];
@ -408,7 +408,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
break; break;
} }
} }
while (!bwrite_sucess) { while (!bwrite_success) {
wait_writeh2c_limmit--; wait_writeh2c_limmit--;
if (wait_writeh2c_limmit == 0) { if (wait_writeh2c_limmit == 0) {
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@ -515,7 +515,7 @@ static void _rtl92d_fill_h2c_command(struct ieee80211_hw *hw,
"switch case not processed\n"); "switch case not processed\n");
break; break;
} }
bwrite_sucess = true; bwrite_success = true;
rtlhal->last_hmeboxnum = boxnum + 1; rtlhal->last_hmeboxnum = boxnum + 1;
if (rtlhal->last_hmeboxnum == 4) if (rtlhal->last_hmeboxnum == 4)
rtlhal->last_hmeboxnum = 0; rtlhal->last_hmeboxnum = 0;

4
drivers/pci/.gitignore vendored
View File

@ -1,4 +0,0 @@
classlist.h
devlist.h
gen-devlist

2
drivers/scsi/aic7xxx/aic79xx_core.c
View File

@ -2888,7 +2888,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1)
ahd_outb(ahd, CLRINT, CLRSCSIINT); ahd_outb(ahd, CLRINT, CLRSCSIINT);
ahd_unpause(ahd); ahd_unpause(ahd);
} else { } else {
printk("Reseting Channel for LQI Phase error\n"); printk("Resetting Channel for LQI Phase error\n");
ahd_dump_card_state(ahd); ahd_dump_card_state(ahd);
ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE);
} }

2
drivers/scsi/bfa/bfa_ioc.c
View File

@ -5587,7 +5587,7 @@ static bfa_status_t bfa_dconf_flash_write(struct bfa_dconf_mod_s *dconf);
static void bfa_dconf_init_cb(void *arg, bfa_status_t status); static void bfa_dconf_init_cb(void *arg, bfa_status_t status);
/* /*
* Begining state of dconf module. Waiting for an event to start. * Beginning state of dconf module. Waiting for an event to start.
*/ */
static void static void
bfa_dconf_sm_uninit(struct bfa_dconf_mod_s *dconf, enum bfa_dconf_event event) bfa_dconf_sm_uninit(struct bfa_dconf_mod_s *dconf, enum bfa_dconf_event event)

2
drivers/scsi/bfa/bfa_ioc.h
View File

@ -530,7 +530,7 @@ struct bfa_diag_results_fwping {
struct bfa_diag_qtest_result_s { struct bfa_diag_qtest_result_s {
u32 status; u32 status;
u16 count; /* sucessful queue test count */ u16 count; /* successful queue test count */
u8 queue; u8 queue;
u8 rsvd; /* 64-bit align */ u8 rsvd; /* 64-bit align */
}; };

4
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -908,7 +908,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
return; return;
default: default:
printk(KERN_ERR PFX "Unkonwn netevent %ld", event); printk(KERN_ERR PFX "Unknown netevent %ld", event);
return; return;
} }
@ -1738,7 +1738,7 @@ static int bnx2fc_ulp_get_stats(void *handle)
/** /**
* bnx2fc_ulp_start - cnic callback to initialize & start adapter instance * bnx2fc_ulp_start - cnic callback to initialize & start adapter instance
* *
* @handle: transport handle pointing to adapter struture * @handle: transport handle pointing to adapter structure
* *
* This function maps adapter structure to pcidev structure and initiates * This function maps adapter structure to pcidev structure and initiates
* firmware handshake to enable/initialize on-chip FCoE components. * firmware handshake to enable/initialize on-chip FCoE components.

9
drivers/scsi/gdth.h
View File

@ -49,15 +49,6 @@
/* GDT_ISA */ /* GDT_ISA */
#define GDT2_ID 0x0120941c /* GDT2000/2020 */ #define GDT2_ID 0x0120941c /* GDT2000/2020 */
/* vendor ID, device IDs (PCI) */
/* these defines should already exist in <linux/pci.h> */
#ifndef PCI_VENDOR_ID_VORTEX
#define PCI_VENDOR_ID_VORTEX 0x1119 /* PCI controller vendor ID */
#endif
#ifndef PCI_VENDOR_ID_INTEL
#define PCI_VENDOR_ID_INTEL 0x8086
#endif
#ifndef PCI_DEVICE_ID_VORTEX_GDT60x0 #ifndef PCI_DEVICE_ID_VORTEX_GDT60x0
/* GDT_PCI */ /* GDT_PCI */
#define PCI_DEVICE_ID_VORTEX_GDT60x0 0 /* GDT6000/6020/6050 */ #define PCI_DEVICE_ID_VORTEX_GDT60x0 0 /* GDT6000/6020/6050 */

66
drivers/scsi/ipr.c
View File

@ -192,7 +192,7 @@ static const struct ipr_chip_t ipr_chip[] = {
{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] } { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROCODILE, IPR_USE_MSI, IPR_SIS64, IPR_MMIO, &ipr_chip_cfg[2] }
}; };
static int ipr_max_bus_speeds [] = { static int ipr_max_bus_speeds[] = {
IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE IPR_80MBs_SCSI_RATE, IPR_U160_SCSI_RATE, IPR_U320_SCSI_RATE
}; };
@ -562,7 +562,7 @@ static void ipr_trc_hook(struct ipr_cmnd *ipr_cmd,
trace_entry->u.add_data = add_data; trace_entry->u.add_data = add_data;
} }
#else #else
#define ipr_trc_hook(ipr_cmd, type, add_data) do { } while(0) #define ipr_trc_hook(ipr_cmd, type, add_data) do { } while (0)
#endif #endif
/** /**
@ -1002,7 +1002,7 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type,
**/ **/
static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto) static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto)
{ {
switch(proto) { switch (proto) {
case IPR_PROTO_SATA: case IPR_PROTO_SATA:
case IPR_PROTO_SAS_STP: case IPR_PROTO_SAS_STP:
res->ata_class = ATA_DEV_ATA; 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)
} }
#else #else
#define ipr_get_ioa_dump(ioa_cfg, dump) do { } while(0) #define ipr_get_ioa_dump(ioa_cfg, dump) do { } while (0)
#endif #endif
/** /**
@ -3055,7 +3055,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
**/ **/
static void ipr_release_dump(struct kref *kref) static void ipr_release_dump(struct kref *kref)
{ {
struct ipr_dump *dump = container_of(kref,struct ipr_dump,kref); struct ipr_dump *dump = container_of(kref, struct ipr_dump, kref);
struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg; struct ipr_ioa_cfg *ioa_cfg = dump->ioa_cfg;
unsigned long lock_flags = 0; unsigned long lock_flags = 0;
int i; int i;
@ -3142,7 +3142,7 @@ restart:
break; break;
} }
} }
} while(did_work); } while (did_work);
list_for_each_entry(res, &ioa_cfg->used_res_q, queue) { list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
if (res->add_to_ml) { if (res->add_to_ml) {
@ -3268,7 +3268,7 @@ static ssize_t ipr_show_log_level(struct device *dev,
* number of bytes printed to buffer * number of bytes printed to buffer
**/ **/
static ssize_t ipr_store_log_level(struct device *dev, static ssize_t ipr_store_log_level(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct Scsi_Host *shost = class_to_shost(dev); struct Scsi_Host *shost = class_to_shost(dev);
@ -3315,7 +3315,7 @@ static ssize_t ipr_store_diagnostics(struct device *dev,
return -EACCES; return -EACCES;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 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,
unsigned long lock_flags; unsigned long lock_flags;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@ -3746,7 +3746,7 @@ static ssize_t ipr_store_update_fw(struct device *dev,
len = snprintf(fname, 99, "%s", buf); len = snprintf(fname, 99, "%s", buf);
fname[len-1] = '\0'; fname[len-1] = '\0';
if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);
return -EIO; return -EIO;
} }
@ -4612,7 +4612,7 @@ static int ipr_slave_alloc(struct scsi_device *sdev)
* Return value: * Return value:
* SUCCESS / FAILED * SUCCESS / FAILED
**/ **/
static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd) static int __ipr_eh_host_reset(struct scsi_cmnd *scsi_cmd)
{ {
struct ipr_ioa_cfg *ioa_cfg; struct ipr_ioa_cfg *ioa_cfg;
int rc; int rc;
@ -4634,7 +4634,7 @@ static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
return rc; return rc;
} }
static int ipr_eh_host_reset(struct scsi_cmnd * cmd) static int ipr_eh_host_reset(struct scsi_cmnd *cmd)
{ {
int rc; int rc;
@ -4701,7 +4701,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
} }
LEAVE; LEAVE;
return (IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0); return IPR_IOASC_SENSE_KEY(ioasc) ? -EIO : 0;
} }
/** /**
@ -4725,7 +4725,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
ENTER; ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); 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,
* Return value: * Return value:
* SUCCESS / FAILED * SUCCESS / FAILED
**/ **/
static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd) static int __ipr_eh_dev_reset(struct scsi_cmnd *scsi_cmd)
{ {
struct ipr_cmnd *ipr_cmd; struct ipr_cmnd *ipr_cmd;
struct ipr_ioa_cfg *ioa_cfg; struct ipr_ioa_cfg *ioa_cfg;
@ -4811,10 +4811,10 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
res->resetting_device = 0; res->resetting_device = 0;
LEAVE; LEAVE;
return (rc ? FAILED : SUCCESS); return rc ? FAILED : SUCCESS;
} }
static int ipr_eh_dev_reset(struct scsi_cmnd * cmd) static int ipr_eh_dev_reset(struct scsi_cmnd *cmd)
{ {
int rc; int rc;
@ -4910,7 +4910,7 @@ static void ipr_abort_timeout(struct ipr_cmnd *ipr_cmd)
* Return value: * Return value:
* SUCCESS / FAILED * SUCCESS / FAILED
**/ **/
static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd) static int ipr_cancel_op(struct scsi_cmnd *scsi_cmd)
{ {
struct ipr_cmnd *ipr_cmd; struct ipr_cmnd *ipr_cmd;
struct ipr_ioa_cfg *ioa_cfg; struct ipr_ioa_cfg *ioa_cfg;
@ -4979,7 +4979,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
res->needs_sync_complete = 1; res->needs_sync_complete = 1;
LEAVE; LEAVE;
return (IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS); return IPR_IOASC_SENSE_KEY(ioasc) ? FAILED : SUCCESS;
} }
/** /**
@ -4989,7 +4989,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
* Return value: * Return value:
* SUCCESS / FAILED * SUCCESS / FAILED
**/ **/
static int ipr_eh_abort(struct scsi_cmnd * scsi_cmd) static int ipr_eh_abort(struct scsi_cmnd *scsi_cmd)
{ {
unsigned long flags; unsigned long flags;
int rc; int rc;
@ -5907,7 +5907,7 @@ static int ipr_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
* Return value: * Return value:
* pointer to buffer with description string * pointer to buffer with description string
**/ **/
static const char * ipr_ioa_info(struct Scsi_Host *host) static const char *ipr_ioa_info(struct Scsi_Host *host)
{ {
static char buffer[512]; static char buffer[512];
struct ipr_ioa_cfg *ioa_cfg; struct ipr_ioa_cfg *ioa_cfg;
@ -5965,7 +5965,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
ENTER; ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, flags); spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, flags); spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@ -6005,7 +6005,7 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(ioa_cfg->host->host_lock, flags); spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, flags); spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
@ -6330,7 +6330,7 @@ static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
int i; int i;
if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) { if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){ for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
if (__is_processor(ipr_blocked_processors[i])) if (__is_processor(ipr_blocked_processors[i]))
return 1; return 1;
} }
@ -6608,7 +6608,7 @@ static void ipr_scsi_bus_speed_limit(struct ipr_ioa_cfg *ioa_cfg)
* none * none
**/ **/
static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg, static void ipr_modify_ioafp_mode_page_28(struct ipr_ioa_cfg *ioa_cfg,
struct ipr_mode_pages *mode_pages) struct ipr_mode_pages *mode_pages)
{ {
int i, entry_length; int i, entry_length;
struct ipr_dev_bus_entry *bus; struct ipr_dev_bus_entry *bus;
@ -8022,7 +8022,7 @@ static void ipr_reset_ioa_job(struct ipr_cmnd *ipr_cmd)
ipr_reinit_ipr_cmnd(ipr_cmd); ipr_reinit_ipr_cmnd(ipr_cmd);
ipr_cmd->job_step_failed = ipr_reset_cmd_failed; ipr_cmd->job_step_failed = ipr_reset_cmd_failed;
rc = ipr_cmd->job_step(ipr_cmd); rc = ipr_cmd->job_step(ipr_cmd);
} while(rc == IPR_RC_JOB_CONTINUE); } while (rc == IPR_RC_JOB_CONTINUE);
} }
/** /**
@ -8283,7 +8283,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
} }
if (ioa_cfg->ipr_cmd_pool) if (ioa_cfg->ipr_cmd_pool)
pci_pool_destroy (ioa_cfg->ipr_cmd_pool); pci_pool_destroy(ioa_cfg->ipr_cmd_pool);
kfree(ioa_cfg->ipr_cmnd_list); kfree(ioa_cfg->ipr_cmnd_list);
kfree(ioa_cfg->ipr_cmnd_list_dma); kfree(ioa_cfg->ipr_cmnd_list_dma);
@ -8363,8 +8363,8 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
dma_addr_t dma_addr; dma_addr_t dma_addr;
int i; int i;
ioa_cfg->ipr_cmd_pool = pci_pool_create (IPR_NAME, ioa_cfg->pdev, ioa_cfg->ipr_cmd_pool = pci_pool_create(IPR_NAME, ioa_cfg->pdev,
sizeof(struct ipr_cmnd), 512, 0); sizeof(struct ipr_cmnd), 512, 0);
if (!ioa_cfg->ipr_cmd_pool) if (!ioa_cfg->ipr_cmd_pool)
return -ENOMEM; return -ENOMEM;
@ -8378,7 +8378,7 @@ static int __devinit ipr_alloc_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
} }
for (i = 0; i < IPR_NUM_CMD_BLKS; i++) { for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
ipr_cmd = pci_pool_alloc (ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr); ipr_cmd = pci_pool_alloc(ioa_cfg->ipr_cmd_pool, GFP_KERNEL, &dma_addr);
if (!ipr_cmd) { if (!ipr_cmd) {
ipr_free_cmd_blks(ioa_cfg); ipr_free_cmd_blks(ioa_cfg);
@ -8964,7 +8964,7 @@ static void ipr_scan_vsets(struct ipr_ioa_cfg *ioa_cfg)
int target, lun; int target, lun;
for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++) for (target = 0; target < IPR_MAX_NUM_TARGETS_PER_BUS; target++)
for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++ ) for (lun = 0; lun < IPR_MAX_NUM_VSET_LUNS_PER_TARGET; lun++)
scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun); scsi_add_device(ioa_cfg->host, IPR_VSET_BUS, target, lun);
} }
@ -9010,7 +9010,7 @@ static void __ipr_remove(struct pci_dev *pdev)
ENTER; ENTER;
spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);
@ -9139,7 +9139,7 @@ static void ipr_shutdown(struct pci_dev *pdev)
unsigned long lock_flags = 0; unsigned long lock_flags = 0;
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
while(ioa_cfg->in_reset_reload) { while (ioa_cfg->in_reset_reload) {
spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload); wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

2
drivers/scsi/isci/host.c
View File

@ -492,7 +492,7 @@ static void sci_controller_process_completions(struct isci_host *ihost)
u32 event_cycle; u32 event_cycle;
dev_dbg(&ihost->pdev->dev, dev_dbg(&ihost->pdev->dev,
"%s: completion queue begining get:0x%08x\n", "%s: completion queue beginning get:0x%08x\n",
__func__, __func__,
ihost->completion_queue_get); ihost->completion_queue_get);

2
drivers/scsi/isci/init.c
View File

@ -222,7 +222,7 @@ static struct sas_domain_function_template isci_transport_ops = {
* @isci_host: This parameter specifies the lldd specific wrapper for the * @isci_host: This parameter specifies the lldd specific wrapper for the
* libsas sas_ha struct. * libsas sas_ha struct.
* *
* This method returns an error code indicating sucess or failure. The user * This method returns an error code indicating success or failure. The user
* should check for possible memory allocation error return otherwise, a zero * should check for possible memory allocation error return otherwise, a zero
* indicates success. * indicates success.
*/ */

2
drivers/scsi/isci/port.c
View File

@ -212,7 +212,7 @@ static void isci_port_link_up(struct isci_host *isci_host,
memcpy(iphy->sas_phy.attached_sas_addr, memcpy(iphy->sas_phy.attached_sas_addr,
iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE); iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE);
} else { } else {
dev_err(&isci_host->pdev->dev, "%s: unkown target\n", __func__); dev_err(&isci_host->pdev->dev, "%s: unknown target\n", __func__);
success = false; success = false;
} }

2
drivers/scsi/isci/request.c
View File

@ -2240,7 +2240,7 @@ static enum sci_status atapi_data_tc_completion_handler(struct isci_request *ire
status = ireq->sci_status; status = ireq->sci_status;
sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR); sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR);
} else { } else {
/* If receiving any non-sucess TC status, no UF /* If receiving any non-success TC status, no UF
* received yet, then an UF for the status fis * received yet, then an UF for the status fis
* is coming after (XXX: suspect this is * is coming after (XXX: suspect this is
* actually a protocol error or a bug like the * actually a protocol error or a bug like the

2
drivers/scsi/isci/task.c
View File

@ -532,7 +532,7 @@ int isci_task_abort_task(struct sas_task *task)
/* The request has already completed and there /* The request has already completed and there
* is nothing to do here other than to set the task * is nothing to do here other than to set the task
* done bit, and indicate that the task abort function * done bit, and indicate that the task abort function
* was sucessful. * was successful.
*/ */
spin_lock_irqsave(&task->task_state_lock, flags); spin_lock_irqsave(&task->task_state_lock, flags);
task->task_state_flags |= SAS_TASK_STATE_DONE; task->task_state_flags |= SAS_TASK_STATE_DONE;

2
drivers/scsi/lpfc/lpfc_init.c
View File

@ -6607,7 +6607,7 @@ out_error:
* we just use some constant number as place holder. * we just use some constant number as place holder.
* *
* Return codes * Return codes
* 0 - sucessful * 0 - successful
* -ENOMEM - No availble memory * -ENOMEM - No availble memory
* -EIO - The mailbox failed to complete successfully. * -EIO - The mailbox failed to complete successfully.
**/ **/

4
drivers/scsi/lpfc/lpfc_sli.c
View File

@ -4739,7 +4739,7 @@ lpfc_sli4_read_rev(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,
* is attached to. * is attached to.
* *
* Return codes * Return codes
* 0 - sucessful * 0 - successful
* otherwise - failed to retrieve physical port name * otherwise - failed to retrieve physical port name
**/ **/
static int static int
@ -15209,7 +15209,7 @@ lpfc_check_next_fcf_pri_level(struct lpfc_hba *phba)
/* /*
* if next_fcf_pri was not set above and the list is not empty then * if next_fcf_pri was not set above and the list is not empty then
* we have failed flogis on all of them. So reset flogi failed * we have failed flogis on all of them. So reset flogi failed
* and start at the begining. * and start at the beginning.
*/ */
if (!next_fcf_pri && !list_empty(&phba->fcf.fcf_pri_list)) { if (!next_fcf_pri && !list_empty(&phba->fcf.fcf_pri_list)) {
list_for_each_entry(fcf_pri, &phba->fcf.fcf_pri_list, list) { list_for_each_entry(fcf_pri, &phba->fcf.fcf_pri_list, list) {

5
drivers/scsi/megaraid.c
View File

@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
adapter->host->sg_tablesize = adapter->sglen; adapter->host->sg_tablesize = adapter->sglen;
/* use HP firmware and bios version encoding /* use HP firmware and bios version encoding
Note: fw_version[0|1] and bios_version[0|1] were originally shifted Note: fw_version[0|1] and bios_version[0|1] were originally shifted
right 8 bits making them zero. This 0 value was hardcoded to fix right 8 bits making them zero. This 0 value was hardcoded to fix
sparse warnings. */ sparse warnings. */
if (adapter->product_info.subsysvid == HP_SUBSYS_VID) { if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
sprintf (adapter->fw_version, "%c%d%d.%d%d", sprintf (adapter->fw_version, "%c%d%d.%d%d",
adapter->product_info.fw_version[2], adapter->product_info.fw_version[2],
0, 0,
@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
* support, since this firmware cannot handle 64 bit * support, since this firmware cannot handle 64 bit
* addressing * addressing
*/ */
if ((subsysvid == HP_SUBSYS_VID) && if ((subsysvid == PCI_VENDOR_ID_HP) &&
((subsysid == 0x60E7) || (subsysid == 0x60E8))) { ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
/* /*
* which firmware * which firmware

35
drivers/scsi/megaraid.h
View File

@ -45,45 +45,10 @@
#define MAX_DEV_TYPE 32 #define MAX_DEV_TYPE 32
#ifndef PCI_VENDOR_ID_LSI_LOGIC
#define PCI_VENDOR_ID_LSI_LOGIC 0x1000
#endif
#ifndef PCI_VENDOR_ID_AMI
#define PCI_VENDOR_ID_AMI 0x101E
#endif
#ifndef PCI_VENDOR_ID_DELL
#define PCI_VENDOR_ID_DELL 0x1028
#endif
#ifndef PCI_VENDOR_ID_INTEL
#define PCI_VENDOR_ID_INTEL 0x8086
#endif
#ifndef PCI_DEVICE_ID_AMI_MEGARAID
#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010
#endif
#ifndef PCI_DEVICE_ID_AMI_MEGARAID2
#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
#endif
#ifndef PCI_DEVICE_ID_AMI_MEGARAID3
#define PCI_DEVICE_ID_AMI_MEGARAID3 0x1960
#endif
#define PCI_DEVICE_ID_DISCOVERY 0x000E #define PCI_DEVICE_ID_DISCOVERY 0x000E
#define PCI_DEVICE_ID_PERC4_DI 0x000F #define PCI_DEVICE_ID_PERC4_DI 0x000F
#define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407 #define PCI_DEVICE_ID_PERC4_QC_VERDE 0x0407
/* Sub-System Vendor IDs */
#define AMI_SUBSYS_VID 0x101E
#define DELL_SUBSYS_VID 0x1028
#define HP_SUBSYS_VID 0x103C
#define LSI_SUBSYS_VID 0x1000
#define INTEL_SUBSYS_VID 0x8086
#define HBA_SIGNATURE 0x3344 #define HBA_SIGNATURE 0x3344
#define HBA_SIGNATURE_471 0xCCCC #define HBA_SIGNATURE_471 0xCCCC
#define HBA_SIGNATURE_64BIT 0x0299 #define HBA_SIGNATURE_64BIT 0x0299

6
drivers/scsi/mvumi.c
View File

@ -122,7 +122,7 @@ static struct mvumi_res *mvumi_alloc_mem_resource(struct mvumi_hba *mhba,
if (!res) { if (!res) {
dev_err(&mhba->pdev->dev, dev_err(&mhba->pdev->dev,
"Failed to allocate memory for resouce manager.\n"); "Failed to allocate memory for resource manager.\n");
return NULL; return NULL;
} }
@ -1007,13 +1007,13 @@ static int mvumi_handshake(struct mvumi_hba *mhba)
tmp |= INT_MAP_COMAOUT | INT_MAP_COMAERR; tmp |= INT_MAP_COMAOUT | INT_MAP_COMAERR;
iowrite32(tmp, regs + CPU_ENPOINTA_MASK_REG); iowrite32(tmp, regs + CPU_ENPOINTA_MASK_REG);
iowrite32(mhba->list_num_io, mhba->ib_shadow); iowrite32(mhba->list_num_io, mhba->ib_shadow);
/* Set InBound List Avaliable count shadow */ /* Set InBound List Available count shadow */
iowrite32(lower_32_bits(mhba->ib_shadow_phys), iowrite32(lower_32_bits(mhba->ib_shadow_phys),
regs + CLA_INB_AVAL_COUNT_BASEL); regs + CLA_INB_AVAL_COUNT_BASEL);
iowrite32(upper_32_bits(mhba->ib_shadow_phys), iowrite32(upper_32_bits(mhba->ib_shadow_phys),
regs + CLA_INB_AVAL_COUNT_BASEH); regs + CLA_INB_AVAL_COUNT_BASEH);
/* Set OutBound List Avaliable count shadow */ /* Set OutBound List Available count shadow */
iowrite32((mhba->list_num_io-1) | CL_POINTER_TOGGLE, iowrite32((mhba->list_num_io-1) | CL_POINTER_TOGGLE,
mhba->ob_shadow); mhba->ob_shadow);
iowrite32(lower_32_bits(mhba->ob_shadow_phys), regs + 0x5B0); iowrite32(lower_32_bits(mhba->ob_shadow_phys), regs + 0x5B0);

6
drivers/scsi/qla4xxx/ql4_os.c
View File

@ -803,7 +803,7 @@ static void qla4xxx_conn_get_stats(struct iscsi_cls_conn *cls_conn,
iscsi_stats_dma); iscsi_stats_dma);
if (ret != QLA_SUCCESS) { if (ret != QLA_SUCCESS) {
ql4_printk(KERN_ERR, ha, ql4_printk(KERN_ERR, ha,
"Unable to retreive iscsi stats\n"); "Unable to retrieve iscsi stats\n");
goto free_stats; goto free_stats;
} }
@ -4338,7 +4338,7 @@ static int qla4xxx_compare_tuple_ddb(struct scsi_qla_host *ha,
return QLA_ERROR; return QLA_ERROR;
/* For multi sessions, driver generates the ISID, so do not compare /* For multi sessions, driver generates the ISID, so do not compare
* ISID in reset path since it would be a comparision between the * ISID in reset path since it would be a comparison between the
* driver generated ISID and firmware generated ISID. This could * driver generated ISID and firmware generated ISID. This could
* lead to adding duplicated DDBs in the list as driver generated * lead to adding duplicated DDBs in the list as driver generated
* ISID would not match firmware generated ISID. * ISID would not match firmware generated ISID.
@ -5326,7 +5326,7 @@ static void qla4xxx_destroy_fw_ddb_session(struct scsi_qla_host *ha)
} }
} }
/** /**
* qla4xxx_remove_adapter - calback function to remove adapter. * qla4xxx_remove_adapter - callback function to remove adapter.
* @pci_dev: PCI device pointer * @pci_dev: PCI device pointer
**/ **/
static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev) static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)

4
drivers/scsi/vmw_pvscsi.c
View File

@ -295,7 +295,7 @@ static void ll_adapter_reset(const struct pvscsi_adapter *adapter)
static void ll_bus_reset(const struct pvscsi_adapter *adapter) static void ll_bus_reset(const struct pvscsi_adapter *adapter)
{ {
dev_dbg(pvscsi_dev(adapter), "Reseting bus on %p\n", adapter); dev_dbg(pvscsi_dev(adapter), "Resetting bus on %p\n", adapter);
pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_RESET_BUS, NULL, 0); pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_RESET_BUS, NULL, 0);
} }
@ -304,7 +304,7 @@ static void ll_device_reset(const struct pvscsi_adapter *adapter, u32 target)
{ {
struct PVSCSICmdDescResetDevice cmd = { 0 }; struct PVSCSICmdDescResetDevice cmd = { 0 };
dev_dbg(pvscsi_dev(adapter), "Reseting device: target=%u\n", target); dev_dbg(pvscsi_dev(adapter), "Resetting device: target=%u\n", target);
cmd.target = target; cmd.target = target;

2
drivers/spi/spi-au1550.c
View File

@ -475,7 +475,7 @@ static irqreturn_t au1550_spi_dma_irq_callback(struct au1550_spi *hw)
/* /*
* due to an spi error we consider transfer as done, * due to an spi error we consider transfer as done,
* so mask all events until before next transfer start * so mask all events until before next transfer start
* and stop the possibly running dma immediatelly * and stop the possibly running dma immediately
*/ */
au1550_spi_mask_ack_all(hw); au1550_spi_mask_ack_all(hw);
au1xxx_dbdma_stop(hw->dma_rx_ch); au1xxx_dbdma_stop(hw->dma_rx_ch);

2
drivers/spi/spi-bfin-sport.c
View File

@ -467,7 +467,7 @@ bfin_sport_spi_pump_transfers(unsigned long data)
dev_dbg(drv_data->dev, "IO write error!\n"); dev_dbg(drv_data->dev, "IO write error!\n");
drv_data->state = ERROR_STATE; drv_data->state = ERROR_STATE;
} else { } else {
/* Update total byte transfered */ /* Update total byte transferred */
message->actual_length += transfer->len; message->actual_length += transfer->len;
/* Move to next transfer of this msg */ /* Move to next transfer of this msg */
drv_data->state = bfin_sport_spi_next_transfer(drv_data); drv_data->state = bfin_sport_spi_next_transfer(drv_data);

2
drivers/spi/spi-oc-tiny.c
View File

@ -129,7 +129,7 @@ static int tiny_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
unsigned int i; unsigned int i;
if (hw->irq >= 0) { if (hw->irq >= 0) {
/* use intrrupt driven data transfer */ /* use interrupt driven data transfer */
hw->len = t->len; hw->len = t->len;
hw->txp = t->tx_buf; hw->txp = t->tx_buf;
hw->rxp = t->rx_buf; hw->rxp = t->rx_buf;

4
drivers/spi/spi-ppc4xx.c
View File

@ -101,7 +101,7 @@ struct spi_ppc4xx_regs {
u8 dummy; u8 dummy;
/* /*
* Clock divisor modulus register * Clock divisor modulus register
* This uses the follwing formula: * This uses the following formula:
* SCPClkOut = OPBCLK/(4(CDM + 1)) * SCPClkOut = OPBCLK/(4(CDM + 1))
* or * or
* CDM = (OPBCLK/4*SCPClkOut) - 1 * CDM = (OPBCLK/4*SCPClkOut) - 1
@ -201,7 +201,7 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)
return -EINVAL; return -EINVAL;
} }
/* Write new configration */ /* Write new configuration */
out_8(&hw->regs->mode, cs->mode); out_8(&hw->regs->mode, cs->mode);
/* Set the clock */ /* Set the clock */

2
drivers/spi/spi-topcliff-pch.c
View File

@ -505,7 +505,7 @@ static int pch_spi_transfer(struct spi_device *pspi, struct spi_message *pmsg)
} }
if (unlikely(pspi->max_speed_hz == 0)) { if (unlikely(pspi->max_speed_hz == 0)) {
dev_err(&pspi->dev, "%s pch_spi_tranfer maxspeed=%d\n", dev_err(&pspi->dev, "%s pch_spi_transfer maxspeed=%d\n",
__func__, pspi->max_speed_hz); __func__, pspi->max_speed_hz);
retval = -EINVAL; retval = -EINVAL;
goto err_out; goto err_out;

4
drivers/target/iscsi/iscsi_target_parameters.c
View File

@ -662,7 +662,7 @@ int iscsi_extract_key_value(char *textbuf, char **key, char **value)
{ {
*value = strchr(textbuf, '='); *value = strchr(textbuf, '=');
if (!*value) { if (!*value) {
pr_err("Unable to locate \"=\" seperator for key," pr_err("Unable to locate \"=\" separator for key,"
" ignoring request.\n"); " ignoring request.\n");
return -1; return -1;
} }
@ -1269,7 +1269,7 @@ static int iscsi_check_value(struct iscsi_param *param, char *value)
comma_ptr = strchr(value, ','); comma_ptr = strchr(value, ',');
if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) { if (comma_ptr && !IS_TYPE_VALUE_LIST(param)) {
pr_err("Detected value seperator \",\", but" pr_err("Detected value separator \",\", but"
" key \"%s\" does not allow a value list," " key \"%s\" does not allow a value list,"
" protocol error.\n", param->name); " protocol error.\n", param->name);
return -1; return -1;

1
drivers/video/backlight/88pm860x_bl.c
View File

@ -228,7 +228,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
data->port = pdata->flags; data->port = pdata->flags;
if (data->port < 0) { if (data->port < 0) {
dev_err(&pdev->dev, "wrong platform data is assigned"); dev_err(&pdev->dev, "wrong platform data is assigned");
kfree(data);
return -EINVAL; return -EINVAL;
} }

2
drivers/video/exynos/exynos_mipi_dsi.c
View File

@ -461,7 +461,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
done: done:
platform_set_drvdata(pdev, dsim); platform_set_drvdata(pdev, dsim);
dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__, dev_dbg(&pdev->dev, "%s() completed successfully (%s mode)\n", __func__,
dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB"); dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");
return 0; return 0;

4
drivers/video/tmiofb.c
View File

@ -694,6 +694,10 @@ static int __devinit tmiofb_probe(struct platform_device *dev)
dev_err(&dev->dev, "NULL platform data!\n"); dev_err(&dev->dev, "NULL platform data!\n");
return -EINVAL; return -EINVAL;
} }
if (ccr == NULL || lcr == NULL || vram == NULL || irq < 0) {
dev_err(&dev->dev, "missing resources\n");
return -EINVAL;
}
info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev); info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev);

2
drivers/w1/masters/ds1wm.c
View File

@ -349,7 +349,7 @@ static void ds1wm_search(void *data, struct w1_master *master_dev,
"pass: %d entering ASM\n", pass); "pass: %d entering ASM\n", pass);
ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA); ds1wm_write_register(ds1wm_data, DS1WM_CMD, DS1WM_CMD_SRA);
dev_dbg(&ds1wm_data->pdev->dev, dev_dbg(&ds1wm_data->pdev->dev,
"pass: %d begining nibble loop\n", pass); "pass: %d beginning nibble loop\n", pass);
r_prime = 0; r_prime = 0;
d = 0; d = 0;

2
fs/btrfs/ctree.h
View File

@ -116,7 +116,7 @@ struct btrfs_ordered_sum;
#define BTRFS_FREE_SPACE_OBJECTID -11ULL #define BTRFS_FREE_SPACE_OBJECTID -11ULL
/* /*
* The inode number assigned to the special inode for sotring * The inode number assigned to the special inode for storing
* free ino cache * free ino cache
*/ */
#define BTRFS_FREE_INO_OBJECTID -12ULL #define BTRFS_FREE_INO_OBJECTID -12ULL

2
fs/btrfs/delayed-ref.h
View File

@ -18,7 +18,7 @@
#ifndef __DELAYED_REF__ #ifndef __DELAYED_REF__
#define __DELAYED_REF__ #define __DELAYED_REF__
/* these are the possible values of struct btrfs_delayed_ref->action */ /* these are the possible values of struct btrfs_delayed_ref_node->action */
#define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */ #define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */
#define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */ #define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */
#define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */ #define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */

4
fs/btrfs/inode.c
View File

@ -1971,8 +1971,8 @@ out:
ordered_extent->len - 1, NULL, GFP_NOFS); ordered_extent->len - 1, NULL, GFP_NOFS);
/* /*
* This needs to be dont to make sure anybody waiting knows we are done * This needs to be done to make sure anybody waiting knows we are done
* upating everything for this ordered extent. * updating everything for this ordered extent.
*/ */
btrfs_remove_ordered_extent(inode, ordered_extent); btrfs_remove_ordered_extent(inode, ordered_extent);

2
fs/ext2/balloc.c
View File

@ -479,7 +479,7 @@ void ext2_discard_reservation(struct inode *inode)
/** /**
* ext2_free_blocks() -- Free given blocks and update quota and i_blocks * ext2_free_blocks() -- Free given blocks and update quota and i_blocks
* @inode: inode * @inode: inode
* @block: start physcial block to free * @block: start physical block to free
* @count: number of blocks to free * @count: number of blocks to free
*/ */
void ext2_free_blocks (struct inode * inode, unsigned long block, void ext2_free_blocks (struct inode * inode, unsigned long block,

2
fs/ext3/balloc.c
View File

@ -483,7 +483,7 @@ void ext3_discard_reservation(struct inode *inode)
* ext3_free_blocks_sb() -- Free given blocks and update quota * ext3_free_blocks_sb() -- Free given blocks and update quota
* @handle: handle to this transaction * @handle: handle to this transaction
* @sb: super block * @sb: super block
* @block: start physcial block to free * @block: start physical block to free
* @count: number of blocks to free * @count: number of blocks to free
* @pdquot_freed_blocks: pointer to quota * @pdquot_freed_blocks: pointer to quota
*/ */

2
fs/ext3/inode.c
View File

@ -3207,7 +3207,7 @@ out_brelse:
* *
* - Within generic_file_write() for O_SYNC files. * - Within generic_file_write() for O_SYNC files.
* Here, there will be no transaction running. We wait for any running * Here, there will be no transaction running. We wait for any running
* trasnaction to commit. * transaction to commit.
* *
* - Within sys_sync(), kupdate and such. * - Within sys_sync(), kupdate and such.
* We wait on commit, if tol to. * We wait on commit, if tol to.

14
fs/ext4/inode.c
View File

@ -3313,7 +3313,7 @@ int ext4_discard_partial_page_buffers(handle_t *handle,
* handle: The journal handle * handle: The journal handle
* inode: The files inode * inode: The files inode
* page: A locked page that contains the offset "from" * page: A locked page that contains the offset "from"
* from: The starting byte offset (from the begining of the file) * from: The starting byte offset (from the beginning of the file)
* to begin discarding * to begin discarding
* len: The length of bytes to discard * len: The length of bytes to discard
* flags: Optional flags that may be used: * flags: Optional flags that may be used:
@ -3321,11 +3321,11 @@ int ext4_discard_partial_page_buffers(handle_t *handle,
* EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED * EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED
* Only zero the regions of the page whose buffer heads * Only zero the regions of the page whose buffer heads
* have already been unmapped. This flag is appropriate * have already been unmapped. This flag is appropriate
* for updateing the contents of a page whose blocks may * for updating the contents of a page whose blocks may
* have already been released, and we only want to zero * have already been released, and we only want to zero
* out the regions that correspond to those released blocks. * out the regions that correspond to those released blocks.
* *
* Returns zero on sucess or negative on failure. * Returns zero on success or negative on failure.
*/ */
static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,
struct inode *inode, struct page *page, loff_t from, struct inode *inode, struct page *page, loff_t from,
@ -3486,7 +3486,7 @@ int ext4_can_truncate(struct inode *inode)
* @offset: The offset where the hole will begin * @offset: The offset where the hole will begin
* @len: The length of the hole * @len: The length of the hole
* *
* Returns: 0 on sucess or negative on failure * Returns: 0 on success or negative on failure
*/ */
int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) int 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,
if (i_blocks <= ~0U) { if (i_blocks <= ~0U) {
/* /*
* i_blocks can be represnted in a 32 bit variable * i_blocks can be represented in a 32 bit variable
* as multiple of 512 bytes * as multiple of 512 bytes
*/ */
raw_inode->i_blocks_lo = cpu_to_le32(i_blocks); raw_inode->i_blocks_lo = cpu_to_le32(i_blocks);
@ -4169,7 +4169,7 @@ out_brelse:
* *
* - Within generic_file_write() for O_SYNC files. * - Within generic_file_write() for O_SYNC files.
* Here, there will be no transaction running. We wait for any running * Here, there will be no transaction running. We wait for any running
* trasnaction to commit. * transaction to commit.
* *
* - Within sys_sync(), kupdate and such. * - Within sys_sync(), kupdate and such.
* We wait on commit, if tol to. * We wait on commit, if tol to.
@ -4413,7 +4413,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk)
* worse case, the indexs blocks spread over different block groups * worse case, the indexs blocks spread over different block groups
* *
* If datablocks are discontiguous, they are possible to spread over * If datablocks are discontiguous, they are possible to spread over
* different block groups too. If they are contiuguous, with flexbg, * different block groups too. If they are contiguous, with flexbg,
* they could still across block group boundary. * they could still across block group boundary.
* *
* Also account for superblock, inode, quota and xattr blocks * Also account for superblock, inode, quota and xattr blocks

2
fs/ext4/mballoc.c
View File

@ -4709,7 +4709,7 @@ error_return:
* ext4_group_add_blocks() -- Add given blocks to an existing group * ext4_group_add_blocks() -- Add given blocks to an existing group
* @handle: handle to this transaction * @handle: handle to this transaction
* @sb: super block * @sb: super block
* @block: start physcial block to add to the block group * @block: start physical block to add to the block group
* @count: number of blocks to free * @count: number of blocks to free
* *
* This marks the blocks as free in the bitmap and buddy. * This marks the blocks as free in the bitmap and buddy.

4
fs/fs-writeback.c
View File

@ -577,10 +577,6 @@ static long writeback_chunk_size(struct backing_dev_info *bdi,
/* /*
* Write a portion of b_io inodes which belong to @sb. * Write a portion of b_io inodes which belong to @sb.
* *
* If @only_this_sb is true, then find and write all such
* inodes. Otherwise write only ones which go sequentially
* in reverse order.
*
* Return the number of pages and/or inodes written. * Return the number of pages and/or inodes written.
*/ */
static long writeback_sb_inodes(struct super_block *sb, static long writeback_sb_inodes(struct super_block *sb,

2
fs/libfs.c
View File

@ -874,7 +874,7 @@ struct dentry *generic_fh_to_dentry(struct super_block *sb, struct fid *fid,
EXPORT_SYMBOL_GPL(generic_fh_to_dentry); EXPORT_SYMBOL_GPL(generic_fh_to_dentry);
/** /**
* generic_fh_to_dentry - generic helper for the fh_to_parent export operation * generic_fh_to_parent - generic helper for the fh_to_parent export operation
* @sb: filesystem to do the file handle conversion on * @sb: filesystem to do the file handle conversion on
* @fid: file handle to convert * @fid: file handle to convert
* @fh_len: length of the file handle in bytes * @fh_len: length of the file handle in bytes

2
fs/nfs/super.c
View File

@ -1537,7 +1537,7 @@ static int nfs_parse_mount_options(char *raw,
/* /*
* verify that any proto=/mountproto= options match the address * verify that any proto=/mountproto= options match the address
* familiies in the addr=/mountaddr= options. * families in the addr=/mountaddr= options.
*/ */
if (protofamily != AF_UNSPEC && if (protofamily != AF_UNSPEC &&
protofamily != mnt->nfs_server.address.ss_family) protofamily != mnt->nfs_server.address.ss_family)

2
include/linux/irqdesc.h
View File

@ -10,12 +10,10 @@
struct irq_affinity_notify; struct irq_affinity_notify;
struct proc_dir_entry; struct proc_dir_entry;
struct timer_rand_state;
struct module; struct module;
/** /**
* struct irq_desc - interrupt descriptor * struct irq_desc - interrupt descriptor
* @irq_data: per irq and chip data passed down to chip functions * @irq_data: per irq and chip data passed down to chip functions
* @timer_rand_state: pointer to timer rand state struct
* @kstat_irqs: irq stats per cpu * @kstat_irqs: irq stats per cpu
* @handle_irq: highlevel irq-events handler * @handle_irq: highlevel irq-events handler
* @preflow_handler: handler called before the flow handler (currently used by sparc) * @preflow_handler: handler called before the flow handler (currently used by sparc)

2
include/linux/mfd/max8998.h
View File

@ -67,7 +67,7 @@ struct max8998_regulator_data {
/** /**
* struct max8998_board - packages regulator init data * struct max8998_board - packages regulator init data
* @regulators: array of defined regulators * @regulators: array of defined regulators
* @num_regulators: number of regultors used * @num_regulators: number of regulators used
* @irq_base: base IRQ number for max8998, required for IRQs * @irq_base: base IRQ number for max8998, required for IRQs
* @ono: power onoff IRQ number for max8998 * @ono: power onoff IRQ number for max8998
* @buck_voltage_lock: Do NOT change the values of the following six * @buck_voltage_lock: Do NOT change the values of the following six

2
include/trace/define_trace.h
View File

@ -1,5 +1,5 @@
/* /*
* Trace files that want to automate creationg of all tracepoints defined * Trace files that want to automate creation of all tracepoints defined
* in their file should include this file. The following are macros that the * in their file should include this file. The following are macros that the
* trace file may define: * trace file may define:
* *

2
mm/bootmem.c
View File

@ -419,7 +419,7 @@ int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
} }
/** /**
* reserve_bootmem - mark a page range as usable * reserve_bootmem - mark a page range as reserved
* @addr: starting address of the range * @addr: starting address of the range
* @size: size of the range in bytes * @size: size of the range in bytes
* @flags: reservation flags (see linux/bootmem.h) * @flags: reservation flags (see linux/bootmem.h)

2
net/8021q/vlanproc.c
View File

@ -105,7 +105,7 @@ static const struct file_operations vlandev_fops = {
}; };
/* /*
* Proc filesystem derectory entries. * Proc filesystem directory entries.
*/ */
/* Strings */ /* Strings */

4
scripts/coccinelle/api/memdup_user.cocci
View File

@ -51,10 +51,10 @@ statement S1,S2;
p << r.p; p << r.p;
@@ @@
coccilib.org.print_todo(p[0], "WARNING opportunity for memdep_user") coccilib.org.print_todo(p[0], "WARNING opportunity for memdup_user")
@script:python depends on report@ @script:python depends on report@
p << r.p; p << r.p;
@@ @@
coccilib.report.print_report(p[0], "WARNING opportunity for memdep_user") coccilib.report.print_report(p[0], "WARNING opportunity for memdup_user")

1
security/apparmor/.gitignore vendored
View File

@ -1,6 +1,5 @@
# #
# Generated include files # Generated include files
# #
af_names.h
capability_names.h capability_names.h
rlim_names.h rlim_names.h

1
sound/oss/.gitignore vendored
View File

@ -1,4 +1,3 @@
#Ignore generated files #Ignore generated files
maui_boot.h
pss_boot.h pss_boot.h
trix_boot.h trix_boot.h

2
tools/perf/util/callchain.h
View File

@ -58,7 +58,7 @@ struct callchain_list {
/* /*
* A callchain cursor is a single linked list that * A callchain cursor is a single linked list that
* let one feed a callchain progressively. * let one feed a callchain progressively.
* It keeps persitent allocated entries to minimize * It keeps persistent allocated entries to minimize
* allocations. * allocations.
*/ */
struct callchain_cursor_node { struct callchain_cursor_node {

2
tools/perf/util/parse-events-test.c
View File

@ -752,7 +752,7 @@ static int test_pmu(void)
ret = stat(path, &st); ret = stat(path, &st);
if (ret) if (ret)
pr_debug("ommiting PMU cpu tests\n"); pr_debug("omitting PMU cpu tests\n");
return !ret; return !ret;
} }

2
tools/perf/util/python-ext-sources
View File

@ -1,5 +1,5 @@
# #
# List of files needed by perf python extention # List of files needed by perf python extension
# #
# Each source file must be placed on its own line so that it can be # Each source file must be placed on its own line so that it can be
# processed by Makefile and util/setup.py accordingly. # processed by Makefile and util/setup.py accordingly.

2
tools/testing/ktest/examples/include/defaults.conf
View File

@ -33,7 +33,7 @@ DEFAULTS
THIS_DIR := ${PWD} THIS_DIR := ${PWD}
# to orginize your configs, having each machine save their configs # to organize your configs, having each machine save their configs
# into a separate directly is useful. # into a separate directly is useful.
CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE} CONFIG_DIR := ${THIS_DIR}/configs/${MACHINE}

2
tools/testing/ktest/examples/include/tests.conf
View File

@ -47,7 +47,7 @@ BUILD_NOCLEAN = 1
# Build, install, boot and test with a randconfg 10 times. # Build, install, boot and test with a randconfg 10 times.
# It is important that you have set MIN_CONFIG in the config # It is important that you have set MIN_CONFIG in the config
# that includes this file otherwise it is likely that the # that includes this file otherwise it is likely that the
# randconfig will not have the neccessary configs needed to # randconfig will not have the necessary configs needed to
# boot your box. This version of the test requires a min # boot your box. This version of the test requires a min
# config that has enough to make sure the target has network # config that has enough to make sure the target has network
# working. # working.

6
tools/testing/selftests/vm/run_vmtests
View File

@ -36,7 +36,7 @@ mkdir $mnt
mount -t hugetlbfs none $mnt mount -t hugetlbfs none $mnt
echo "--------------------" echo "--------------------"
echo "runing hugepage-mmap" echo "running hugepage-mmap"
echo "--------------------" echo "--------------------"
./hugepage-mmap ./hugepage-mmap
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -50,7 +50,7 @@ shmall=`cat /proc/sys/kernel/shmall`
echo 268435456 > /proc/sys/kernel/shmmax echo 268435456 > /proc/sys/kernel/shmmax
echo 4194304 > /proc/sys/kernel/shmall echo 4194304 > /proc/sys/kernel/shmall
echo "--------------------" echo "--------------------"
echo "runing hugepage-shm" echo "running hugepage-shm"
echo "--------------------" echo "--------------------"
./hugepage-shm ./hugepage-shm
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -62,7 +62,7 @@ echo $shmmax > /proc/sys/kernel/shmmax
echo $shmall > /proc/sys/kernel/shmall echo $shmall > /proc/sys/kernel/shmall
echo "--------------------" echo "--------------------"
echo "runing map_hugetlb" echo "running map_hugetlb"
echo "--------------------" echo "--------------------"
./map_hugetlb ./map_hugetlb
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then