diff options
46 files changed, 54 insertions, 59 deletions
diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index e550b117ec4f..93c6ea52b671 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c | |||
@@ -841,7 +841,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, | |||
841 | break; | 841 | break; |
842 | case DW_CFA_GNU_window_save: | 842 | case DW_CFA_GNU_window_save: |
843 | default: | 843 | default: |
844 | unw_debug("UNKNOW OPCODE 0x%x\n", opcode); | 844 | unw_debug("UNKNOWN OPCODE 0x%x\n", opcode); |
845 | result = 0; | 845 | result = 0; |
846 | break; | 846 | break; |
847 | } | 847 | } |
diff --git a/arch/powerpc/include/asm/smu.h b/arch/powerpc/include/asm/smu.h index 6e909f3e6a46..37d2da6feabf 100644 --- a/arch/powerpc/include/asm/smu.h +++ b/arch/powerpc/include/asm/smu.h | |||
@@ -478,7 +478,7 @@ extern unsigned long smu_cmdbuf_abs; | |||
478 | 478 | ||
479 | 479 | ||
480 | /* | 480 | /* |
481 | * Kenrel asynchronous i2c interface | 481 | * Kernel asynchronous i2c interface |
482 | */ | 482 | */ |
483 | 483 | ||
484 | #define SMU_I2C_READ_MAX 0x1d | 484 | #define SMU_I2C_READ_MAX 0x1d |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index b8e15c678960..308c5e15676b 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -721,7 +721,7 @@ void __init early_init_devtree(void *params) | |||
721 | */ | 721 | */ |
722 | of_scan_flat_dt(early_init_dt_scan_cpus, NULL); | 722 | of_scan_flat_dt(early_init_dt_scan_cpus, NULL); |
723 | if (boot_cpuid < 0) { | 723 | if (boot_cpuid < 0) { |
724 | printk("Failed to indentify boot CPU !\n"); | 724 | printk("Failed to identify boot CPU !\n"); |
725 | BUG(); | 725 | BUG(); |
726 | } | 726 | } |
727 | 727 | ||
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c index 9445a824819e..abeb9ec0d117 100644 --- a/arch/powerpc/perf/hv-24x7.c +++ b/arch/powerpc/perf/hv-24x7.c | |||
@@ -1126,7 +1126,7 @@ static int h_24x7_event_init(struct perf_event *event) | |||
1126 | /* Physical domains & other lpars require extra capabilities */ | 1126 | /* Physical domains & other lpars require extra capabilities */ |
1127 | if (!caps.collect_privileged && (is_physical_domain(domain) || | 1127 | if (!caps.collect_privileged && (is_physical_domain(domain) || |
1128 | (event_get_lpar(event) != event_get_lpar_max()))) { | 1128 | (event_get_lpar(event) != event_get_lpar_max()))) { |
1129 | pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n", | 1129 | pr_devel("hv permissions disallow: is_physical_domain:%d, lpar=0x%llx\n", |
1130 | is_physical_domain(domain), | 1130 | is_physical_domain(domain), |
1131 | event_get_lpar(event)); | 1131 | event_get_lpar(event)); |
1132 | return -EACCES; | 1132 | return -EACCES; |
diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c index 7a180f0308d5..680232d6ba48 100644 --- a/arch/powerpc/platforms/85xx/p1022_rdk.c +++ b/arch/powerpc/platforms/85xx/p1022_rdk.c | |||
@@ -50,14 +50,14 @@ void p1022rdk_set_pixel_clock(unsigned int pixclock) | |||
50 | /* Map the global utilities registers. */ | 50 | /* Map the global utilities registers. */ |
51 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); | 51 | guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); |
52 | if (!guts_np) { | 52 | if (!guts_np) { |
53 | pr_err("p1022rdk: missing global utilties device node\n"); | 53 | pr_err("p1022rdk: missing global utilities device node\n"); |
54 | return; | 54 | return; |
55 | } | 55 | } |
56 | 56 | ||
57 | guts = of_iomap(guts_np, 0); | 57 | guts = of_iomap(guts_np, 0); |
58 | of_node_put(guts_np); | 58 | of_node_put(guts_np); |
59 | if (!guts) { | 59 | if (!guts) { |
60 | pr_err("p1022rdk: could not map global utilties device\n"); | 60 | pr_err("p1022rdk: could not map global utilities device\n"); |
61 | return; | 61 | return; |
62 | } | 62 | } |
63 | 63 | ||
diff --git a/arch/x86/kernel/test_rodata.c b/arch/x86/kernel/test_rodata.c index b79133abda48..5ecbfe5099da 100644 --- a/arch/x86/kernel/test_rodata.c +++ b/arch/x86/kernel/test_rodata.c | |||
@@ -57,7 +57,7 @@ int rodata_test(void) | |||
57 | /* test 3: check the value hasn't changed */ | 57 | /* test 3: check the value hasn't changed */ |
58 | /* If this test fails, we managed to overwrite the data */ | 58 | /* If this test fails, we managed to overwrite the data */ |
59 | if (!rodata_test_data) { | 59 | if (!rodata_test_data) { |
60 | printk(KERN_ERR "rodata_test: Test 3 failes (end data)\n"); | 60 | printk(KERN_ERR "rodata_test: Test 3 fails (end data)\n"); |
61 | return -ENODEV; | 61 | return -ENODEV; |
62 | } | 62 | } |
63 | /* test 4: check if the rodata section is 4Kb aligned */ | 63 | /* test 4: check if the rodata section is 4Kb aligned */ |
diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c index 87ee1c7d0b54..44bf815adb6c 100644 --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c | |||
@@ -436,7 +436,7 @@ static int max1027_probe(struct spi_device *spi) | |||
436 | indio_dev->num_channels * 2, | 436 | indio_dev->num_channels * 2, |
437 | GFP_KERNEL); | 437 | GFP_KERNEL); |
438 | if (st->buffer == NULL) { | 438 | if (st->buffer == NULL) { |
439 | dev_err(&indio_dev->dev, "Can't allocate bufffer\n"); | 439 | dev_err(&indio_dev->dev, "Can't allocate buffer\n"); |
440 | return -ENOMEM; | 440 | return -ENOMEM; |
441 | } | 441 | } |
442 | 442 | ||
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index c1493f4162fb..d5bdbaf93a1a 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c | |||
@@ -1092,7 +1092,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1092 | } | 1092 | } |
1093 | card->ci = get_card_info(ent->driver_data); | 1093 | card->ci = get_card_info(ent->driver_data); |
1094 | if (!card->ci) { | 1094 | if (!card->ci) { |
1095 | pr_info("mISDN: do not have informations about adapter at %s\n", | 1095 | pr_info("mISDN: do not have information about adapter at %s\n", |
1096 | pci_name(pdev)); | 1096 | pci_name(pdev)); |
1097 | kfree(card); | 1097 | kfree(card); |
1098 | pci_disable_device(pdev); | 1098 | pci_disable_device(pdev); |
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 87f7dff20ff6..52c43821f746 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
@@ -295,7 +295,7 @@ dsp_cmx_del_conf_member(struct dsp *dsp) | |||
295 | } | 295 | } |
296 | } | 296 | } |
297 | printk(KERN_WARNING | 297 | printk(KERN_WARNING |
298 | "%s: dsp is not present in its own conf_meber list.\n", | 298 | "%s: dsp is not present in its own conf_member list.\n", |
299 | __func__); | 299 | __func__); |
300 | 300 | ||
301 | return -EINVAL; | 301 | return -EINVAL; |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 77025f5cb57d..0222b1a35a2d 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -460,7 +460,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) | |||
460 | } | 460 | } |
461 | if (dsp_debug & DEBUG_DSP_CORE) | 461 | if (dsp_debug & DEBUG_DSP_CORE) |
462 | printk(KERN_DEBUG "%s: enable mixing of " | 462 | printk(KERN_DEBUG "%s: enable mixing of " |
463 | "tx-data with conf mebers\n", __func__); | 463 | "tx-data with conf members\n", __func__); |
464 | dsp->tx_mix = 1; | 464 | dsp->tx_mix = 1; |
465 | dsp_cmx_hardware(dsp->conf, dsp); | 465 | dsp_cmx_hardware(dsp->conf, dsp); |
466 | dsp_rx_off(dsp); | 466 | dsp_rx_off(dsp); |
@@ -474,7 +474,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) | |||
474 | } | 474 | } |
475 | if (dsp_debug & DEBUG_DSP_CORE) | 475 | if (dsp_debug & DEBUG_DSP_CORE) |
476 | printk(KERN_DEBUG "%s: disable mixing of " | 476 | printk(KERN_DEBUG "%s: disable mixing of " |
477 | "tx-data with conf mebers\n", __func__); | 477 | "tx-data with conf members\n", __func__); |
478 | dsp->tx_mix = 0; | 478 | dsp->tx_mix = 0; |
479 | dsp_cmx_hardware(dsp->conf, dsp); | 479 | dsp_cmx_hardware(dsp->conf, dsp); |
480 | dsp_rx_off(dsp); | 480 | dsp_rx_off(dsp); |
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c index ba4ee0b48834..d3d928e1c0ce 100644 --- a/drivers/media/dvb-frontends/m88ds3103.c +++ b/drivers/media/dvb-frontends/m88ds3103.c | |||
@@ -630,7 +630,7 @@ static int m88ds3103_init(struct dvb_frontend *fe) | |||
630 | /* request the firmware, this will block and timeout */ | 630 | /* request the firmware, this will block and timeout */ |
631 | ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); | 631 | ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); |
632 | if (ret) { | 632 | if (ret) { |
633 | dev_err(&priv->i2c->dev, "%s: firmare file '%s' not found\n", | 633 | dev_err(&priv->i2c->dev, "%s: firmware file '%s' not found\n", |
634 | KBUILD_MODNAME, fw_file); | 634 | KBUILD_MODNAME, fw_file); |
635 | goto err; | 635 | goto err; |
636 | } | 636 | } |
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h index aadd1367673f..d7efce8043ed 100644 --- a/drivers/media/dvb-frontends/si2168_priv.h +++ b/drivers/media/dvb-frontends/si2168_priv.h | |||
@@ -40,7 +40,7 @@ struct si2168_dev { | |||
40 | bool ts_clock_inv; | 40 | bool ts_clock_inv; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | /* firmare command struct */ | 43 | /* firmware command struct */ |
44 | #define SI2168_ARGLEN 30 | 44 | #define SI2168_ARGLEN 30 |
45 | struct si2168_cmd { | 45 | struct si2168_cmd { |
46 | u8 args[SI2168_ARGLEN]; | 46 | u8 args[SI2168_ARGLEN]; |
diff --git a/drivers/media/dvb-frontends/tda10071_priv.h b/drivers/media/dvb-frontends/tda10071_priv.h index 420486192736..03f839c431e9 100644 --- a/drivers/media/dvb-frontends/tda10071_priv.h +++ b/drivers/media/dvb-frontends/tda10071_priv.h | |||
@@ -99,7 +99,7 @@ struct tda10071_reg_val_mask { | |||
99 | #define CMD_BER_CONTROL 0x3e | 99 | #define CMD_BER_CONTROL 0x3e |
100 | #define CMD_BER_UPDATE_COUNTERS 0x3f | 100 | #define CMD_BER_UPDATE_COUNTERS 0x3f |
101 | 101 | ||
102 | /* firmare command struct */ | 102 | /* firmware command struct */ |
103 | #define TDA10071_ARGLEN 30 | 103 | #define TDA10071_ARGLEN 30 |
104 | struct tda10071_cmd { | 104 | struct tda10071_cmd { |
105 | u8 args[TDA10071_ARGLEN]; | 105 | u8 args[TDA10071_ARGLEN]; |
diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c index 26019e731993..74cfc3c98edb 100644 --- a/drivers/media/tuners/msi001.c +++ b/drivers/media/tuners/msi001.c | |||
@@ -408,7 +408,7 @@ static int msi001_s_ctrl(struct v4l2_ctrl *ctrl) | |||
408 | s->mixer_gain->cur.val, s->if_gain->val); | 408 | s->mixer_gain->cur.val, s->if_gain->val); |
409 | break; | 409 | break; |
410 | default: | 410 | default: |
411 | dev_dbg(&s->spi->dev, "unkown control %d\n", ctrl->id); | 411 | dev_dbg(&s->spi->dev, "unknown control %d\n", ctrl->id); |
412 | ret = -EINVAL; | 412 | ret = -EINVAL; |
413 | } | 413 | } |
414 | 414 | ||
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c index 0e4a76daf187..7f87c62d91b3 100644 --- a/drivers/mfd/si476x-i2c.c +++ b/drivers/mfd/si476x-i2c.c | |||
@@ -766,7 +766,7 @@ static int si476x_core_probe(struct i2c_client *client, | |||
766 | sizeof(struct v4l2_rds_data), | 766 | sizeof(struct v4l2_rds_data), |
767 | GFP_KERNEL); | 767 | GFP_KERNEL); |
768 | if (rval) { | 768 | if (rval) { |
769 | dev_err(&client->dev, "Could not alloate the FIFO\n"); | 769 | dev_err(&client->dev, "Could not allocate the FIFO\n"); |
770 | goto free_gpio; | 770 | goto free_gpio; |
771 | } | 771 | } |
772 | mutex_init(&core->rds_drainer_status_lock); | 772 | mutex_init(&core->rds_drainer_status_lock); |
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index c84131e28625..f36c76f8b232 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -1758,7 +1758,7 @@ static int mmc_runtime_suspend(struct mmc_host *host) | |||
1758 | 1758 | ||
1759 | err = _mmc_suspend(host, true); | 1759 | err = _mmc_suspend(host, true); |
1760 | if (err) | 1760 | if (err) |
1761 | pr_err("%s: error %d doing aggessive suspend\n", | 1761 | pr_err("%s: error %d doing aggressive suspend\n", |
1762 | mmc_hostname(host), err); | 1762 | mmc_hostname(host), err); |
1763 | 1763 | ||
1764 | return err; | 1764 | return err; |
@@ -1776,7 +1776,7 @@ static int mmc_runtime_resume(struct mmc_host *host) | |||
1776 | 1776 | ||
1777 | err = _mmc_resume(host); | 1777 | err = _mmc_resume(host); |
1778 | if (err) | 1778 | if (err) |
1779 | pr_err("%s: error %d doing aggessive resume\n", | 1779 | pr_err("%s: error %d doing aggressive resume\n", |
1780 | mmc_hostname(host), err); | 1780 | mmc_hostname(host), err); |
1781 | 1781 | ||
1782 | return 0; | 1782 | return 0; |
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index ad4d43eae99d..31a9ef256d06 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
@@ -1157,7 +1157,7 @@ static int mmc_sd_runtime_suspend(struct mmc_host *host) | |||
1157 | 1157 | ||
1158 | err = _mmc_sd_suspend(host); | 1158 | err = _mmc_sd_suspend(host); |
1159 | if (err) | 1159 | if (err) |
1160 | pr_err("%s: error %d doing aggessive suspend\n", | 1160 | pr_err("%s: error %d doing aggressive suspend\n", |
1161 | mmc_hostname(host), err); | 1161 | mmc_hostname(host), err); |
1162 | 1162 | ||
1163 | return err; | 1163 | return err; |
@@ -1175,7 +1175,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) | |||
1175 | 1175 | ||
1176 | err = _mmc_sd_resume(host); | 1176 | err = _mmc_sd_resume(host); |
1177 | if (err) | 1177 | if (err) |
1178 | pr_err("%s: error %d doing aggessive resume\n", | 1178 | pr_err("%s: error %d doing aggressive resume\n", |
1179 | mmc_hostname(host), err); | 1179 | mmc_hostname(host), err); |
1180 | 1180 | ||
1181 | return 0; | 1181 | return 0; |
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index 27f272ed502a..43fa16b5f510 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | |||
@@ -1105,7 +1105,7 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip) | |||
1105 | mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip); | 1105 | mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip); |
1106 | reg = readl(r->gpmi_regs + HW_GPMI_STAT); | 1106 | reg = readl(r->gpmi_regs + HW_GPMI_STAT); |
1107 | } else | 1107 | } else |
1108 | dev_err(this->dev, "unknow arch.\n"); | 1108 | dev_err(this->dev, "unknown arch.\n"); |
1109 | return reg & mask; | 1109 | return reg & mask; |
1110 | } | 1110 | } |
1111 | 1111 | ||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index cfe3c7695455..4c9678c8e139 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | |||
@@ -592,7 +592,7 @@ int bnx2x_vf_mcast(struct bnx2x *bp, struct bnx2x_virtf *vf, | |||
592 | mc = kzalloc(mc_num * sizeof(struct bnx2x_mcast_list_elem), | 592 | mc = kzalloc(mc_num * sizeof(struct bnx2x_mcast_list_elem), |
593 | GFP_KERNEL); | 593 | GFP_KERNEL); |
594 | if (!mc) { | 594 | if (!mc) { |
595 | BNX2X_ERR("Cannot Configure mulicasts due to lack of memory\n"); | 595 | BNX2X_ERR("Cannot Configure multicasts due to lack of memory\n"); |
596 | return -ENOMEM; | 596 | return -ENOMEM; |
597 | } | 597 | } |
598 | } | 598 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 3e0f705a4311..75ee9e4ced51 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -818,7 +818,7 @@ int qlcnic_82xx_config_intr_coalesce(struct qlcnic_adapter *adapter, | |||
818 | 818 | ||
819 | if (rv) | 819 | if (rv) |
820 | netdev_err(adapter->netdev, | 820 | netdev_err(adapter->netdev, |
821 | "Failed to set Rx coalescing parametrs\n"); | 821 | "Failed to set Rx coalescing parameters\n"); |
822 | 822 | ||
823 | return rv; | 823 | return rv; |
824 | } | 824 | } |
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index e22e602beef3..4c2b5a80f17c 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c | |||
@@ -614,7 +614,7 @@ static void recalibrate(struct dp83640_clock *clock) | |||
614 | trigger = CAL_TRIGGER; | 614 | trigger = CAL_TRIGGER; |
615 | cal_gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PHYSYNC, 0); | 615 | cal_gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PHYSYNC, 0); |
616 | if (cal_gpio < 1) { | 616 | if (cal_gpio < 1) { |
617 | pr_err("PHY calibration pin not avaible - PHY is not calibrated."); | 617 | pr_err("PHY calibration pin not available - PHY is not calibrated."); |
618 | return; | 618 | return; |
619 | } | 619 | } |
620 | 620 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index e71a2ce7a448..b97367d50717 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -3211,7 +3211,7 @@ static void airo_print_status(const char *devname, u16 status) | |||
3211 | airo_print_dbg(devname, "link lost (TSF sync lost)"); | 3211 | airo_print_dbg(devname, "link lost (TSF sync lost)"); |
3212 | break; | 3212 | break; |
3213 | default: | 3213 | default: |
3214 | airo_print_dbg(devname, "unknow status %x\n", status); | 3214 | airo_print_dbg(devname, "unknown status %x\n", status); |
3215 | break; | 3215 | break; |
3216 | } | 3216 | } |
3217 | break; | 3217 | break; |
@@ -3233,7 +3233,7 @@ static void airo_print_status(const char *devname, u16 status) | |||
3233 | case STAT_REASSOC: | 3233 | case STAT_REASSOC: |
3234 | break; | 3234 | break; |
3235 | default: | 3235 | default: |
3236 | airo_print_dbg(devname, "unknow status %x\n", status); | 3236 | airo_print_dbg(devname, "unknown status %x\n", status); |
3237 | break; | 3237 | break; |
3238 | } | 3238 | } |
3239 | } | 3239 | } |
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index d6d2f0f00caa..4ce433f1c1fb 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c | |||
@@ -4857,7 +4857,7 @@ static void ath10k_sta_rc_update(struct ieee80211_hw *hw, | |||
4857 | bw = WMI_PEER_CHWIDTH_80MHZ; | 4857 | bw = WMI_PEER_CHWIDTH_80MHZ; |
4858 | break; | 4858 | break; |
4859 | case IEEE80211_STA_RX_BW_160: | 4859 | case IEEE80211_STA_RX_BW_160: |
4860 | ath10k_warn(ar, "Invalid bandwith %d in rc update for %pM\n", | 4860 | ath10k_warn(ar, "Invalid bandwidth %d in rc update for %pM\n", |
4861 | sta->bandwidth, sta->addr); | 4861 | sta->bandwidth, sta->addr); |
4862 | bw = WMI_PEER_CHWIDTH_20MHZ; | 4862 | bw = WMI_PEER_CHWIDTH_20MHZ; |
4863 | break; | 4863 | break; |
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 69ed39731902..dbd894428be6 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c | |||
@@ -1701,7 +1701,7 @@ int wcn36xx_smd_keep_alive_req(struct wcn36xx *wcn, | |||
1701 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { | 1701 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { |
1702 | /* TODO: it also support ARP response type */ | 1702 | /* TODO: it also support ARP response type */ |
1703 | } else { | 1703 | } else { |
1704 | wcn36xx_warn("unknow keep alive packet type %d\n", packet_type); | 1704 | wcn36xx_warn("unknown keep alive packet type %d\n", packet_type); |
1705 | ret = -EINVAL; | 1705 | ret = -EINVAL; |
1706 | goto out; | 1706 | goto out; |
1707 | } | 1707 | } |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c index 2367e8f47a5b..e77c3a46c94a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723be/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8723be/dm.c | |||
@@ -309,7 +309,7 @@ static void rtl8723be_dm_find_minimum_rssi(struct ieee80211_hw *hw) | |||
309 | rtl_dm_dig->min_undec_pwdb_for_dm = | 309 | rtl_dm_dig->min_undec_pwdb_for_dm = |
310 | rtlpriv->dm.entry_min_undec_sm_pwdb; | 310 | rtlpriv->dm.entry_min_undec_sm_pwdb; |
311 | RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD, | 311 | RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD, |
312 | "AP Ext Port or disconnet PWDB = 0x%x\n", | 312 | "AP Ext Port or disconnect PWDB = 0x%x\n", |
313 | rtl_dm_dig->min_undec_pwdb_for_dm); | 313 | rtl_dm_dig->min_undec_pwdb_for_dm); |
314 | } | 314 | } |
315 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n", | 315 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n", |
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c index 0b2082dc48f1..342678d2ed42 100644 --- a/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | |||
@@ -873,7 +873,7 @@ static void rtl8821ae_dm_dig(struct ieee80211_hw *hw) | |||
873 | 873 | ||
874 | if (rtlpriv->falsealm_cnt.cnt_all > 10000) { | 874 | if (rtlpriv->falsealm_cnt.cnt_all > 10000) { |
875 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, | 875 | RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, |
876 | "Abnornally false alarm case.\n"); | 876 | "Abnormally false alarm case.\n"); |
877 | 877 | ||
878 | if (dm_digtable->large_fa_hit != 3) | 878 | if (dm_digtable->large_fa_hit != 3) |
879 | dm_digtable->large_fa_hit++; | 879 | dm_digtable->large_fa_hit++; |
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c index caa153133754..a656d9e83343 100644 --- a/drivers/parisc/eisa_enumerator.c +++ b/drivers/parisc/eisa_enumerator.c | |||
@@ -357,7 +357,7 @@ static int parse_slot_config(int slot, | |||
357 | } | 357 | } |
358 | if (flags & HPEE_FUNCTION_INFO_CFG_FREE_FORM) { | 358 | if (flags & HPEE_FUNCTION_INFO_CFG_FREE_FORM) { |
359 | /* I have no idea how to handle this */ | 359 | /* I have no idea how to handle this */ |
360 | printk("function %d have free-form confgiuration, skipping ", | 360 | printk("function %d have free-form configuration, skipping ", |
361 | num_func); | 361 | num_func); |
362 | pos = p0 + function_len; | 362 | pos = p0 + function_len; |
363 | continue; | 363 | continue; |
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 1806b24faa14..23db4c9ac76c 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c | |||
@@ -466,7 +466,7 @@ static int abx500_set_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip, | |||
466 | break; | 466 | break; |
467 | 467 | ||
468 | default: | 468 | default: |
469 | dev_dbg(pct->dev, "unknow alt_setting %d\n", alt_setting); | 469 | dev_dbg(pct->dev, "unknown alt_setting %d\n", alt_setting); |
470 | 470 | ||
471 | return -EINVAL; | 471 | return -EINVAL; |
472 | } | 472 | } |
diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c index 80d97f3d2ed9..1028760b8a22 100644 --- a/drivers/scsi/be2iscsi/be_cmds.c +++ b/drivers/scsi/be2iscsi/be_cmds.c | |||
@@ -237,7 +237,7 @@ int beiscsi_mccq_compl(struct beiscsi_hba *phba, | |||
237 | beiscsi_log(phba, KERN_WARNING, | 237 | beiscsi_log(phba, KERN_WARNING, |
238 | BEISCSI_LOG_INIT | BEISCSI_LOG_EH | | 238 | BEISCSI_LOG_INIT | BEISCSI_LOG_EH | |
239 | BEISCSI_LOG_CONFIG, | 239 | BEISCSI_LOG_CONFIG, |
240 | "BC_%d : Insufficent Buffer Error " | 240 | "BC_%d : Insufficient Buffer Error " |
241 | "Resp_Len : %d Actual_Resp_Len : %d\n", | 241 | "Resp_Len : %d Actual_Resp_Len : %d\n", |
242 | mbx_resp_hdr->response_length, | 242 | mbx_resp_hdr->response_length, |
243 | mbx_resp_hdr->actual_resp_len); | 243 | mbx_resp_hdr->actual_resp_len); |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index 0045742fab7d..dad959fcf6d8 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
@@ -339,7 +339,7 @@ ch_readconfig(scsi_changer *ch) | |||
339 | ch->firsts[CHET_DT], | 339 | ch->firsts[CHET_DT], |
340 | ch->counts[CHET_DT]); | 340 | ch->counts[CHET_DT]); |
341 | } else { | 341 | } else { |
342 | VPRINTK(KERN_INFO, "reading element address assigment page failed!\n"); | 342 | VPRINTK(KERN_INFO, "reading element address assignment page failed!\n"); |
343 | } | 343 | } |
344 | 344 | ||
345 | /* vendor specific element types */ | 345 | /* vendor specific element types */ |
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 488c3929f19a..0cccd6033feb 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c | |||
@@ -186,7 +186,7 @@ static int _osd_get_print_system_info(struct osd_dev *od, | |||
186 | 186 | ||
187 | if (unlikely(len > sizeof(odi->systemid))) { | 187 | if (unlikely(len > sizeof(odi->systemid))) { |
188 | OSD_ERR("OSD Target error: OSD_SYSTEM_ID too long(%d). " | 188 | OSD_ERR("OSD Target error: OSD_SYSTEM_ID too long(%d). " |
189 | "device idetification might not work\n", len); | 189 | "device identification might not work\n", len); |
190 | len = sizeof(odi->systemid); | 190 | len = sizeof(odi->systemid); |
191 | } | 191 | } |
192 | odi->systemid_len = len; | 192 | odi->systemid_len = len; |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index e59f25bff7ab..5bb57c5282c9 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -5364,7 +5364,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) | |||
5364 | blob = qla2x00_request_firmware(vha); | 5364 | blob = qla2x00_request_firmware(vha); |
5365 | if (!blob) { | 5365 | if (!blob) { |
5366 | ql_log(ql_log_info, vha, 0x0083, | 5366 | ql_log(ql_log_info, vha, 0x0083, |
5367 | "Fimware image unavailable.\n"); | 5367 | "Firmware image unavailable.\n"); |
5368 | ql_log(ql_log_info, vha, 0x0084, | 5368 | ql_log(ql_log_info, vha, 0x0084, |
5369 | "Firmware images can be retrieved from: "QLA_FW_URL ".\n"); | 5369 | "Firmware images can be retrieved from: "QLA_FW_URL ".\n"); |
5370 | return QLA_FUNCTION_FAILED; | 5370 | return QLA_FUNCTION_FAILED; |
@@ -5467,7 +5467,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr) | |||
5467 | blob = qla2x00_request_firmware(vha); | 5467 | blob = qla2x00_request_firmware(vha); |
5468 | if (!blob) { | 5468 | if (!blob) { |
5469 | ql_log(ql_log_warn, vha, 0x0090, | 5469 | ql_log(ql_log_warn, vha, 0x0090, |
5470 | "Fimware image unavailable.\n"); | 5470 | "Firmware image unavailable.\n"); |
5471 | ql_log(ql_log_warn, vha, 0x0091, | 5471 | ql_log(ql_log_warn, vha, 0x0091, |
5472 | "Firmware images can be retrieved from: " | 5472 | "Firmware images can be retrieved from: " |
5473 | QLA_FW_URL ".\n"); | 5473 | QLA_FW_URL ".\n"); |
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index 5c2e0317f1c0..ca3804e34833 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c | |||
@@ -788,7 +788,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options, | |||
788 | rsp->msix = &ha->msix_entries[que_id + 1]; | 788 | rsp->msix = &ha->msix_entries[que_id + 1]; |
789 | else | 789 | else |
790 | ql_log(ql_log_warn, base_vha, 0x00e3, | 790 | ql_log(ql_log_warn, base_vha, 0x00e3, |
791 | "MSIX not enalbled.\n"); | 791 | "MSIX not enabled.\n"); |
792 | 792 | ||
793 | ha->rsp_q_map[que_id] = rsp; | 793 | ha->rsp_q_map[que_id] = rsp; |
794 | rsp->rid = rid; | 794 | rsp->rid = rid; |
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 54cb2ac9339b..7d2b18f2675c 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -1274,7 +1274,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha) | |||
1274 | 1274 | ||
1275 | if (off == ADDR_ERROR) { | 1275 | if (off == ADDR_ERROR) { |
1276 | ql_log(ql_log_fatal, vha, 0x0116, | 1276 | ql_log(ql_log_fatal, vha, 0x0116, |
1277 | "Unknow addr: 0x%08lx.\n", buf[i].addr); | 1277 | "Unknown addr: 0x%08lx.\n", buf[i].addr); |
1278 | continue; | 1278 | continue; |
1279 | } | 1279 | } |
1280 | 1280 | ||
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index cce1cbc1a927..5319b3cb219e 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
@@ -446,11 +446,11 @@ static int qla25xx_setup_mode(struct scsi_qla_host *vha) | |||
446 | } | 446 | } |
447 | ha->flags.cpu_affinity_enabled = 1; | 447 | ha->flags.cpu_affinity_enabled = 1; |
448 | ql_dbg(ql_dbg_multiq, vha, 0xc007, | 448 | ql_dbg(ql_dbg_multiq, vha, 0xc007, |
449 | "CPU affinity mode enalbed, " | 449 | "CPU affinity mode enabled, " |
450 | "no. of response queues:%d no. of request queues:%d.\n", | 450 | "no. of response queues:%d no. of request queues:%d.\n", |
451 | ha->max_rsp_queues, ha->max_req_queues); | 451 | ha->max_rsp_queues, ha->max_req_queues); |
452 | ql_dbg(ql_dbg_init, vha, 0x00e9, | 452 | ql_dbg(ql_dbg_init, vha, 0x00e9, |
453 | "CPU affinity mode enalbed, " | 453 | "CPU affinity mode enabled, " |
454 | "no. of response queues:%d no. of request queues:%d.\n", | 454 | "no. of response queues:%d no. of request queues:%d.\n", |
455 | ha->max_rsp_queues, ha->max_req_queues); | 455 | ha->max_rsp_queues, ha->max_req_queues); |
456 | } | 456 | } |
@@ -4102,7 +4102,7 @@ qla83xx_schedule_work(scsi_qla_host_t *base_vha, int work_code) | |||
4102 | break; | 4102 | break; |
4103 | default: | 4103 | default: |
4104 | ql_log(ql_log_warn, base_vha, 0xb05f, | 4104 | ql_log(ql_log_warn, base_vha, 0xb05f, |
4105 | "Unknow work-code=0x%x.\n", work_code); | 4105 | "Unknown work-code=0x%x.\n", work_code); |
4106 | } | 4106 | } |
4107 | 4107 | ||
4108 | return; | 4108 | return; |
@@ -4702,7 +4702,7 @@ qla83xx_idc_state_handler(scsi_qla_host_t *base_vha) | |||
4702 | break; | 4702 | break; |
4703 | default: | 4703 | default: |
4704 | ql_log(ql_log_warn, base_vha, 0xb071, | 4704 | ql_log(ql_log_warn, base_vha, 0xb071, |
4705 | "Unknow Device State: %x.\n", dev_state); | 4705 | "Unknown Device State: %x.\n", dev_state); |
4706 | qla83xx_idc_unlock(base_vha, 0); | 4706 | qla83xx_idc_unlock(base_vha, 0); |
4707 | qla8xxx_dev_failed_handler(base_vha); | 4707 | qla8xxx_dev_failed_handler(base_vha); |
4708 | rval = QLA_FUNCTION_FAILED; | 4708 | rval = QLA_FUNCTION_FAILED; |
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index 967b2c2b7cf1..0655fecf8240 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c | |||
@@ -229,7 +229,6 @@ static int goldfish_tty_probe(struct platform_device *pdev) | |||
229 | { | 229 | { |
230 | struct goldfish_tty *qtty; | 230 | struct goldfish_tty *qtty; |
231 | int ret = -EINVAL; | 231 | int ret = -EINVAL; |
232 | int i; | ||
233 | struct resource *r; | 232 | struct resource *r; |
234 | struct device *ttydev; | 233 | struct device *ttydev; |
235 | void __iomem *base; | 234 | void __iomem *base; |
@@ -293,7 +292,6 @@ static int goldfish_tty_probe(struct platform_device *pdev) | |||
293 | mutex_unlock(&goldfish_tty_lock); | 292 | mutex_unlock(&goldfish_tty_lock); |
294 | return 0; | 293 | return 0; |
295 | 294 | ||
296 | tty_unregister_device(goldfish_tty_driver, i); | ||
297 | err_tty_register_device_failed: | 295 | err_tty_register_device_failed: |
298 | free_irq(irq, pdev); | 296 | free_irq(irq, pdev); |
299 | err_request_irq_failed: | 297 | err_request_irq_failed: |
diff --git a/drivers/tty/ipwireless/hardware.c b/drivers/tty/ipwireless/hardware.c index 5c77e1eac4ee..ad7031a4f3c4 100644 --- a/drivers/tty/ipwireless/hardware.c +++ b/drivers/tty/ipwireless/hardware.c | |||
@@ -1455,7 +1455,7 @@ static void __handle_setup_get_version_rsp(struct ipw_hardware *hw) | |||
1455 | return; | 1455 | return; |
1456 | } | 1456 | } |
1457 | 1457 | ||
1458 | set_RTS(hw, PRIO_SETUP, channel_idx, | 1458 | ret = set_RTS(hw, PRIO_SETUP, channel_idx, |
1459 | (hw->control_lines [channel_idx] & | 1459 | (hw->control_lines [channel_idx] & |
1460 | IPW_CONTROL_LINE_RTS) != 0); | 1460 | IPW_CONTROL_LINE_RTS) != 0); |
1461 | if (ret) { | 1461 | if (ret) { |
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index d72817ac51f6..762c7a3cf43d 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c | |||
@@ -195,7 +195,7 @@ static int do_verify_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_dat | |||
195 | /* unchecked xdatum is chained with c->xattr_unchecked */ | 195 | /* unchecked xdatum is chained with c->xattr_unchecked */ |
196 | list_del_init(&xd->xindex); | 196 | list_del_init(&xd->xindex); |
197 | 197 | ||
198 | dbg_xattr("success on verfying xdatum (xid=%u, version=%u)\n", | 198 | dbg_xattr("success on verifying xdatum (xid=%u, version=%u)\n", |
199 | xd->xid, xd->version); | 199 | xd->xid, xd->version); |
200 | 200 | ||
201 | return 0; | 201 | return 0; |
diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h index 13e929679550..d600afb21926 100644 --- a/include/linux/smpboot.h +++ b/include/linux/smpboot.h | |||
@@ -47,6 +47,5 @@ struct smp_hotplug_thread { | |||
47 | 47 | ||
48 | int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread); | 48 | int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread); |
49 | void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread); | 49 | void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread); |
50 | int smpboot_thread_schedule(void); | ||
51 | 50 | ||
52 | #endif | 51 | #endif |
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h index 669045ab73f3..0a34489a46b6 100644 --- a/include/linux/stacktrace.h +++ b/include/linux/stacktrace.h | |||
@@ -7,8 +7,6 @@ struct task_struct; | |||
7 | struct pt_regs; | 7 | struct pt_regs; |
8 | 8 | ||
9 | #ifdef CONFIG_STACKTRACE | 9 | #ifdef CONFIG_STACKTRACE |
10 | struct task_struct; | ||
11 | |||
12 | struct stack_trace { | 10 | struct stack_trace { |
13 | unsigned int nr_entries, max_entries; | 11 | unsigned int nr_entries, max_entries; |
14 | unsigned long *entries; | 12 | unsigned long *entries; |
diff --git a/init/main.c b/init/main.c index 4a6974e67839..54565bf57beb 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(static_key_initialized); | |||
143 | * rely on the BIOS and skip the reset operation. | 143 | * rely on the BIOS and skip the reset operation. |
144 | * | 144 | * |
145 | * This is useful if kernel is booting in an unreliable environment. | 145 | * This is useful if kernel is booting in an unreliable environment. |
146 | * For ex. kdump situaiton where previous kernel has crashed, BIOS has been | 146 | * For ex. kdump situation where previous kernel has crashed, BIOS has been |
147 | * skipped and devices will be in unknown state. | 147 | * skipped and devices will be in unknown state. |
148 | */ | 148 | */ |
149 | unsigned int reset_devices; | 149 | unsigned int reset_devices; |
diff --git a/lib/div64.c b/lib/div64.c index 4382ad77777e..19ea7ed4b948 100644 --- a/lib/div64.c +++ b/lib/div64.c | |||
@@ -127,7 +127,7 @@ EXPORT_SYMBOL(div64_u64_rem); | |||
127 | * by the book 'Hacker's Delight'. The original source and full proof | 127 | * by the book 'Hacker's Delight'. The original source and full proof |
128 | * can be found here and is available for use without restriction. | 128 | * can be found here and is available for use without restriction. |
129 | * | 129 | * |
130 | * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt' | 130 | * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt' |
131 | */ | 131 | */ |
132 | #ifndef div64_u64 | 132 | #ifndef div64_u64 |
133 | u64 div64_u64(u64 dividend, u64 divisor) | 133 | u64 div64_u64(u64 dividend, u64 divisor) |
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 5bdd300db0f7..2df34eb5d65f 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c | |||
@@ -272,7 +272,7 @@ static int parse_qos(const char *buff) | |||
272 | qos.rxtp.max_pcr = rx_pcr; | 272 | qos.rxtp.max_pcr = rx_pcr; |
273 | qos.rxtp.max_sdu = rx_sdu; | 273 | qos.rxtp.max_sdu = rx_sdu; |
274 | qos.aal = ATM_AAL5; | 274 | qos.aal = ATM_AAL5; |
275 | dprintk("parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n", | 275 | dprintk("parse_qos(): setting qos parameters to tx=%d,%d rx=%d,%d\n", |
276 | qos.txtp.max_pcr, qos.txtp.max_sdu, | 276 | qos.txtp.max_pcr, qos.txtp.max_sdu, |
277 | qos.rxtp.max_pcr, qos.rxtp.max_sdu); | 277 | qos.rxtp.max_pcr, qos.rxtp.max_sdu); |
278 | 278 | ||
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 124676c13780..e28909fddd30 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -1136,7 +1136,7 @@ rpcrdma_init_fmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf) | |||
1136 | int i, rc; | 1136 | int i, rc; |
1137 | 1137 | ||
1138 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; | 1138 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; |
1139 | dprintk("RPC: %s: initalizing %d FMRs\n", __func__, i); | 1139 | dprintk("RPC: %s: initializing %d FMRs\n", __func__, i); |
1140 | 1140 | ||
1141 | while (i--) { | 1141 | while (i--) { |
1142 | r = kzalloc(sizeof(*r), GFP_KERNEL); | 1142 | r = kzalloc(sizeof(*r), GFP_KERNEL); |
@@ -1169,7 +1169,7 @@ rpcrdma_init_frmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf) | |||
1169 | int i, rc; | 1169 | int i, rc; |
1170 | 1170 | ||
1171 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; | 1171 | i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS; |
1172 | dprintk("RPC: %s: initalizing %d FRMRs\n", __func__, i); | 1172 | dprintk("RPC: %s: initializing %d FRMRs\n", __func__, i); |
1173 | 1173 | ||
1174 | while (i--) { | 1174 | while (i--) { |
1175 | r = kzalloc(sizeof(*r), GFP_KERNEL); | 1175 | r = kzalloc(sizeof(*r), GFP_KERNEL); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e5c990889dcc..10f0886e78ec 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -2755,7 +2755,7 @@ int snd_soc_register_component(struct device *dev, | |||
2755 | 2755 | ||
2756 | ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true); | 2756 | ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true); |
2757 | if (ret < 0) { | 2757 | if (ret < 0) { |
2758 | dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); | 2758 | dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); |
2759 | goto err_cleanup; | 2759 | goto err_cleanup; |
2760 | } | 2760 | } |
2761 | 2761 | ||
@@ -3076,7 +3076,7 @@ int snd_soc_register_codec(struct device *dev, | |||
3076 | 3076 | ||
3077 | ret = snd_soc_register_dais(&codec->component, dai_drv, num_dai, false); | 3077 | ret = snd_soc_register_dais(&codec->component, dai_drv, num_dai, false); |
3078 | if (ret < 0) { | 3078 | if (ret < 0) { |
3079 | dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret); | 3079 | dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); |
3080 | goto err_cleanup; | 3080 | goto err_cleanup; |
3081 | } | 3081 | } |
3082 | 3082 | ||
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index b5247d777f0e..d32cf93565da 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c | |||
@@ -456,7 +456,7 @@ static int convert_variable_fields(Dwarf_Die *vr_die, const char *varname, | |||
456 | return -EINVAL; | 456 | return -EINVAL; |
457 | } | 457 | } |
458 | if (field->name[0] == '[') { | 458 | if (field->name[0] == '[') { |
459 | pr_err("Semantic error: %s is not a pointor" | 459 | pr_err("Semantic error: %s is not a pointer" |
460 | " nor array.\n", varname); | 460 | " nor array.\n", varname); |
461 | return -EINVAL; | 461 | return -EINVAL; |
462 | } | 462 | } |