Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags

+54 -59
+1 -1
arch/arc/kernel/unwind.c
··· 841 841 break; 842 842 case DW_CFA_GNU_window_save: 843 843 default: 844 - unw_debug("UNKNOW OPCODE 0x%x\n", opcode); 844 + unw_debug("UNKNOWN OPCODE 0x%x\n", opcode); 845 845 result = 0; 846 846 break; 847 847 }
+1 -1
arch/powerpc/include/asm/smu.h
··· 478 478 479 479 480 480 /* 481 - * Kenrel asynchronous i2c interface 481 + * Kernel asynchronous i2c interface 482 482 */ 483 483 484 484 #define SMU_I2C_READ_MAX 0x1d
+1 -1
arch/powerpc/kernel/prom.c
··· 721 721 */ 722 722 of_scan_flat_dt(early_init_dt_scan_cpus, NULL); 723 723 if (boot_cpuid < 0) { 724 - printk("Failed to indentify boot CPU !\n"); 724 + printk("Failed to identify boot CPU !\n"); 725 725 BUG(); 726 726 } 727 727
+1 -1
arch/powerpc/perf/hv-24x7.c
··· 1126 1126 /* Physical domains & other lpars require extra capabilities */ 1127 1127 if (!caps.collect_privileged && (is_physical_domain(domain) || 1128 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 1130 is_physical_domain(domain), 1131 1131 event_get_lpar(event)); 1132 1132 return -EACCES;
+2 -2
arch/powerpc/platforms/85xx/p1022_rdk.c
··· 50 50 /* Map the global utilities registers. */ 51 51 guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); 52 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 54 return; 55 55 } 56 56 57 57 guts = of_iomap(guts_np, 0); 58 58 of_node_put(guts_np); 59 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 61 return; 62 62 } 63 63
+1 -1
arch/x86/kernel/test_rodata.c
··· 57 57 /* test 3: check the value hasn't changed */ 58 58 /* If this test fails, we managed to overwrite the data */ 59 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 61 return -ENODEV; 62 62 } 63 63 /* test 4: check if the rodata section is 4Kb aligned */
+1 -1
drivers/iio/adc/max1027.c
··· 436 436 indio_dev->num_channels * 2, 437 437 GFP_KERNEL); 438 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 440 return -ENOMEM; 441 441 } 442 442
+1 -1
drivers/isdn/hardware/mISDN/mISDNinfineon.c
··· 1092 1092 } 1093 1093 card->ci = get_card_info(ent->driver_data); 1094 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 1096 pci_name(pdev)); 1097 1097 kfree(card); 1098 1098 pci_disable_device(pdev);
+1 -1
drivers/isdn/mISDN/dsp_cmx.c
··· 295 295 } 296 296 } 297 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 299 __func__); 300 300 301 301 return -EINVAL;
+2 -2
drivers/isdn/mISDN/dsp_core.c
··· 460 460 } 461 461 if (dsp_debug & DEBUG_DSP_CORE) 462 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 464 dsp->tx_mix = 1; 465 465 dsp_cmx_hardware(dsp->conf, dsp); 466 466 dsp_rx_off(dsp); ··· 474 474 } 475 475 if (dsp_debug & DEBUG_DSP_CORE) 476 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 478 dsp->tx_mix = 0; 479 479 dsp_cmx_hardware(dsp->conf, dsp); 480 480 dsp_rx_off(dsp);
+1 -1
drivers/media/dvb-frontends/m88ds3103.c
··· 630 630 /* request the firmware, this will block and timeout */ 631 631 ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); 632 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 634 KBUILD_MODNAME, fw_file); 635 635 goto err; 636 636 }
+1 -1
drivers/media/dvb-frontends/si2168_priv.h
··· 40 40 bool ts_clock_inv; 41 41 }; 42 42 43 - /* firmare command struct */ 43 + /* firmware command struct */ 44 44 #define SI2168_ARGLEN 30 45 45 struct si2168_cmd { 46 46 u8 args[SI2168_ARGLEN];
+1 -1
drivers/media/dvb-frontends/tda10071_priv.h
··· 99 99 #define CMD_BER_CONTROL 0x3e 100 100 #define CMD_BER_UPDATE_COUNTERS 0x3f 101 101 102 - /* firmare command struct */ 102 + /* firmware command struct */ 103 103 #define TDA10071_ARGLEN 30 104 104 struct tda10071_cmd { 105 105 u8 args[TDA10071_ARGLEN];
+1 -1
drivers/media/tuners/msi001.c
··· 408 408 s->mixer_gain->cur.val, s->if_gain->val); 409 409 break; 410 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 412 ret = -EINVAL; 413 413 } 414 414
+1 -1
drivers/mfd/si476x-i2c.c
··· 766 766 sizeof(struct v4l2_rds_data), 767 767 GFP_KERNEL); 768 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 770 goto free_gpio; 771 771 } 772 772 mutex_init(&core->rds_drainer_status_lock);
+2 -2
drivers/mmc/core/mmc.c
··· 1758 1758 1759 1759 err = _mmc_suspend(host, true); 1760 1760 if (err) 1761 - pr_err("%s: error %d doing aggessive suspend\n", 1761 + pr_err("%s: error %d doing aggressive suspend\n", 1762 1762 mmc_hostname(host), err); 1763 1763 1764 1764 return err; ··· 1776 1776 1777 1777 err = _mmc_resume(host); 1778 1778 if (err) 1779 - pr_err("%s: error %d doing aggessive resume\n", 1779 + pr_err("%s: error %d doing aggressive resume\n", 1780 1780 mmc_hostname(host), err); 1781 1781 1782 1782 return 0;
+2 -2
drivers/mmc/core/sd.c
··· 1157 1157 1158 1158 err = _mmc_sd_suspend(host); 1159 1159 if (err) 1160 - pr_err("%s: error %d doing aggessive suspend\n", 1160 + pr_err("%s: error %d doing aggressive suspend\n", 1161 1161 mmc_hostname(host), err); 1162 1162 1163 1163 return err; ··· 1175 1175 1176 1176 err = _mmc_sd_resume(host); 1177 1177 if (err) 1178 - pr_err("%s: error %d doing aggessive resume\n", 1178 + pr_err("%s: error %d doing aggressive resume\n", 1179 1179 mmc_hostname(host), err); 1180 1180 1181 1181 return 0;
+1 -1
drivers/mtd/nand/gpmi-nand/gpmi-lib.c
··· 1105 1105 mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip); 1106 1106 reg = readl(r->gpmi_regs + HW_GPMI_STAT); 1107 1107 } else 1108 - dev_err(this->dev, "unknow arch.\n"); 1108 + dev_err(this->dev, "unknown arch.\n"); 1109 1109 return reg & mask; 1110 1110 } 1111 1111
+1 -1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
··· 592 592 mc = kzalloc(mc_num * sizeof(struct bnx2x_mcast_list_elem), 593 593 GFP_KERNEL); 594 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 596 return -ENOMEM; 597 597 } 598 598 }
+1 -1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
··· 818 818 819 819 if (rv) 820 820 netdev_err(adapter->netdev, 821 - "Failed to set Rx coalescing parametrs\n"); 821 + "Failed to set Rx coalescing parameters\n"); 822 822 823 823 return rv; 824 824 }
+1 -1
drivers/net/phy/dp83640.c
··· 614 614 trigger = CAL_TRIGGER; 615 615 cal_gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PHYSYNC, 0); 616 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 618 return; 619 619 } 620 620
+2 -2
drivers/net/wireless/airo.c
··· 3211 3211 airo_print_dbg(devname, "link lost (TSF sync lost)"); 3212 3212 break; 3213 3213 default: 3214 - airo_print_dbg(devname, "unknow status %x\n", status); 3214 + airo_print_dbg(devname, "unknown status %x\n", status); 3215 3215 break; 3216 3216 } 3217 3217 break; ··· 3233 3233 case STAT_REASSOC: 3234 3234 break; 3235 3235 default: 3236 - airo_print_dbg(devname, "unknow status %x\n", status); 3236 + airo_print_dbg(devname, "unknown status %x\n", status); 3237 3237 break; 3238 3238 } 3239 3239 }
+1 -1
drivers/net/wireless/ath/ath10k/mac.c
··· 4857 4857 bw = WMI_PEER_CHWIDTH_80MHZ; 4858 4858 break; 4859 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 4861 sta->bandwidth, sta->addr); 4862 4862 bw = WMI_PEER_CHWIDTH_20MHZ; 4863 4863 break;
+1 -1
drivers/net/wireless/ath/wcn36xx/smd.c
··· 1701 1701 } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { 1702 1702 /* TODO: it also support ARP response type */ 1703 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 1705 ret = -EINVAL; 1706 1706 goto out; 1707 1707 }
+1 -1
drivers/net/wireless/rtlwifi/rtl8723be/dm.c
··· 309 309 rtl_dm_dig->min_undec_pwdb_for_dm = 310 310 rtlpriv->dm.entry_min_undec_sm_pwdb; 311 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 313 rtl_dm_dig->min_undec_pwdb_for_dm); 314 314 } 315 315 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, "MinUndecoratedPWDBForDM =%d\n",
+1 -1
drivers/net/wireless/rtlwifi/rtl8821ae/dm.c
··· 873 873 874 874 if (rtlpriv->falsealm_cnt.cnt_all > 10000) { 875 875 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, 876 - "Abnornally false alarm case.\n"); 876 + "Abnormally false alarm case.\n"); 877 877 878 878 if (dm_digtable->large_fa_hit != 3) 879 879 dm_digtable->large_fa_hit++;
+1 -1
drivers/parisc/eisa_enumerator.c
··· 357 357 } 358 358 if (flags & HPEE_FUNCTION_INFO_CFG_FREE_FORM) { 359 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 361 num_func); 362 362 pos = p0 + function_len; 363 363 continue;
+1 -1
drivers/pinctrl/nomadik/pinctrl-abx500.c
··· 466 466 break; 467 467 468 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 471 return -EINVAL; 472 472 }
+1 -1
drivers/scsi/be2iscsi/be_cmds.c
··· 237 237 beiscsi_log(phba, KERN_WARNING, 238 238 BEISCSI_LOG_INIT | BEISCSI_LOG_EH | 239 239 BEISCSI_LOG_CONFIG, 240 - "BC_%d : Insufficent Buffer Error " 240 + "BC_%d : Insufficient Buffer Error " 241 241 "Resp_Len : %d Actual_Resp_Len : %d\n", 242 242 mbx_resp_hdr->response_length, 243 243 mbx_resp_hdr->actual_resp_len);
+1 -1
drivers/scsi/ch.c
··· 339 339 ch->firsts[CHET_DT], 340 340 ch->counts[CHET_DT]); 341 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 345 /* vendor specific element types */
+1 -1
drivers/scsi/osd/osd_initiator.c
··· 186 186 187 187 if (unlikely(len > sizeof(odi->systemid))) { 188 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 190 len = sizeof(odi->systemid); 191 191 } 192 192 odi->systemid_len = len;
+2 -2
drivers/scsi/qla2xxx/qla_init.c
··· 5364 5364 blob = qla2x00_request_firmware(vha); 5365 5365 if (!blob) { 5366 5366 ql_log(ql_log_info, vha, 0x0083, 5367 - "Fimware image unavailable.\n"); 5367 + "Firmware image unavailable.\n"); 5368 5368 ql_log(ql_log_info, vha, 0x0084, 5369 5369 "Firmware images can be retrieved from: "QLA_FW_URL ".\n"); 5370 5370 return QLA_FUNCTION_FAILED; ··· 5467 5467 blob = qla2x00_request_firmware(vha); 5468 5468 if (!blob) { 5469 5469 ql_log(ql_log_warn, vha, 0x0090, 5470 - "Fimware image unavailable.\n"); 5470 + "Firmware image unavailable.\n"); 5471 5471 ql_log(ql_log_warn, vha, 0x0091, 5472 5472 "Firmware images can be retrieved from: " 5473 5473 QLA_FW_URL ".\n");
+1 -1
drivers/scsi/qla2xxx/qla_mid.c
··· 788 788 rsp->msix = &ha->msix_entries[que_id + 1]; 789 789 else 790 790 ql_log(ql_log_warn, base_vha, 0x00e3, 791 - "MSIX not enalbled.\n"); 791 + "MSIX not enabled.\n"); 792 792 793 793 ha->rsp_q_map[que_id] = rsp; 794 794 rsp->rid = rid;
+1 -1
drivers/scsi/qla2xxx/qla_nx.c
··· 1274 1274 1275 1275 if (off == ADDR_ERROR) { 1276 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 1278 continue; 1279 1279 } 1280 1280
+4 -4
drivers/scsi/qla2xxx/qla_os.c
··· 446 446 } 447 447 ha->flags.cpu_affinity_enabled = 1; 448 448 ql_dbg(ql_dbg_multiq, vha, 0xc007, 449 - "CPU affinity mode enalbed, " 449 + "CPU affinity mode enabled, " 450 450 "no. of response queues:%d no. of request queues:%d.\n", 451 451 ha->max_rsp_queues, ha->max_req_queues); 452 452 ql_dbg(ql_dbg_init, vha, 0x00e9, 453 - "CPU affinity mode enalbed, " 453 + "CPU affinity mode enabled, " 454 454 "no. of response queues:%d no. of request queues:%d.\n", 455 455 ha->max_rsp_queues, ha->max_req_queues); 456 456 } ··· 4102 4102 break; 4103 4103 default: 4104 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 4108 return; ··· 4702 4702 break; 4703 4703 default: 4704 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 4706 qla83xx_idc_unlock(base_vha, 0); 4707 4707 qla8xxx_dev_failed_handler(base_vha); 4708 4708 rval = QLA_FUNCTION_FAILED;
-2
drivers/tty/goldfish.c
··· 229 229 { 230 230 struct goldfish_tty *qtty; 231 231 int ret = -EINVAL; 232 - int i; 233 232 struct resource *r; 234 233 struct device *ttydev; 235 234 void __iomem *base; ··· 292 293 mutex_unlock(&goldfish_tty_lock); 293 294 return 0; 294 295 295 - tty_unregister_device(goldfish_tty_driver, i); 296 296 err_tty_register_device_failed: 297 297 free_irq(irq, pdev); 298 298 err_request_irq_failed:
+1 -1
drivers/tty/ipwireless/hardware.c
··· 1455 1455 return; 1456 1456 } 1457 1457 1458 - set_RTS(hw, PRIO_SETUP, channel_idx, 1458 + ret = set_RTS(hw, PRIO_SETUP, channel_idx, 1459 1459 (hw->control_lines [channel_idx] & 1460 1460 IPW_CONTROL_LINE_RTS) != 0); 1461 1461 if (ret) {
+1 -1
fs/jffs2/xattr.c
··· 195 195 /* unchecked xdatum is chained with c->xattr_unchecked */ 196 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 199 xd->xid, xd->version); 200 200 201 201 return 0;
-1
include/linux/smpboot.h
··· 47 47 48 48 int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread); 49 49 void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread); 50 - int smpboot_thread_schedule(void); 51 50 52 51 #endif
-2
include/linux/stacktrace.h
··· 7 7 struct pt_regs; 8 8 9 9 #ifdef CONFIG_STACKTRACE 10 - struct task_struct; 11 - 12 10 struct stack_trace { 13 11 unsigned int nr_entries, max_entries; 14 12 unsigned long *entries;
+1 -1
init/main.c
··· 143 143 * rely on the BIOS and skip the reset operation. 144 144 * 145 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 147 * skipped and devices will be in unknown state. 148 148 */ 149 149 unsigned int reset_devices;
+1 -1
lib/div64.c
··· 127 127 * by the book 'Hacker's Delight'. The original source and full proof 128 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 132 #ifndef div64_u64 133 133 u64 div64_u64(u64 dividend, u64 divisor)
+1 -1
net/atm/mpoa_proc.c
··· 272 272 qos.rxtp.max_pcr = rx_pcr; 273 273 qos.rxtp.max_sdu = rx_sdu; 274 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 276 qos.txtp.max_pcr, qos.txtp.max_sdu, 277 277 qos.rxtp.max_pcr, qos.rxtp.max_sdu); 278 278
+2 -2
net/sunrpc/xprtrdma/verbs.c
··· 1136 1136 int i, rc; 1137 1137 1138 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 1141 while (i--) { 1142 1142 r = kzalloc(sizeof(*r), GFP_KERNEL); ··· 1169 1169 int i, rc; 1170 1170 1171 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 1174 while (i--) { 1175 1175 r = kzalloc(sizeof(*r), GFP_KERNEL);
+2 -2
sound/soc/soc-core.c
··· 2755 2755 2756 2756 ret = snd_soc_register_dais(cmpnt, dai_drv, num_dai, true); 2757 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 2759 goto err_cleanup; 2760 2760 } 2761 2761 ··· 3076 3076 3077 3077 ret = snd_soc_register_dais(&codec->component, dai_drv, num_dai, false); 3078 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 3080 goto err_cleanup; 3081 3081 } 3082 3082
+1 -1
tools/perf/util/probe-finder.c
··· 456 456 return -EINVAL; 457 457 } 458 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 460 " nor array.\n", varname); 461 461 return -EINVAL; 462 462 }