aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2010-08-07 06:30:03 -0400
committerJiri Kosina <jkosina@suse.cz>2010-08-09 05:25:17 -0400
commit426d31071ac476ea62c62656b242930c17b58c00 (patch)
tree9c68a1adc490e903c5a9cd192f54caa204bdc18d
parenteef35c2d41ddcc653c20d26b977acaa45c811e1f (diff)
fix printk typo 'faild'
Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/arm/mach-omap1/board-nokia770.c2
-rw-r--r--drivers/ata/pata_bf54x.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c2
-rw-r--r--drivers/net/ps3_gelic_net.c4
-rw-r--r--drivers/net/tulip/pnic2.c2
-rw-r--r--drivers/rtc/rtc-nuc900.c2
-rw-r--r--drivers/video/bf54x-lq043fb.c6
-rw-r--r--drivers/video/bfin-t350mcqb-fb.c2
-rw-r--r--fs/exofs/inode.c14
-rw-r--r--fs/exofs/ios.c10
-rw-r--r--fs/jfs/jfs_mount.c4
-rw-r--r--kernel/trace/trace_kprobe.c2
-rw-r--r--net/wanrouter/wanmain.c4
13 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 8c28b10f3dae..bc93afbb0a68 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -362,7 +362,7 @@ static __init int omap_dsp_init(void)
362 ret = dsp_kfunc_device_register(&nokia770_audio_device); 362 ret = dsp_kfunc_device_register(&nokia770_audio_device);
363 if (ret) { 363 if (ret) {
364 printk(KERN_ERR 364 printk(KERN_ERR
365 "KFUNC device registration faild: %s\n", 365 "KFUNC device registration failed: %s\n",
366 nokia770_audio_device.name); 366 nokia770_audio_device.name);
367 goto out; 367 goto out;
368 } 368 }
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 9cae65de750e..be7b1b21e777 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1588,7 +1588,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev)
1588 host->ports[0]->ioaddr.ctl_addr = (void *)res->start; 1588 host->ports[0]->ioaddr.ctl_addr = (void *)res->start;
1589 1589
1590 if (peripheral_request_list(atapi_io_port, "atapi-io-port")) { 1590 if (peripheral_request_list(atapi_io_port, "atapi-io-port")) {
1591 dev_err(&pdev->dev, "Requesting Peripherals faild\n"); 1591 dev_err(&pdev->dev, "Requesting Peripherals failed\n");
1592 return -EFAULT; 1592 return -EFAULT;
1593 } 1593 }
1594 1594
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index ae0fb7356e62..8de578ee4987 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -268,7 +268,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
268 } 268 }
269 r = radeon_ib_schedule(rdev, parser.ib); 269 r = radeon_ib_schedule(rdev, parser.ib);
270 if (r) { 270 if (r) {
271 DRM_ERROR("Faild to schedule IB !\n"); 271 DRM_ERROR("Failed to schedule IB !\n");
272 } 272 }
273 radeon_cs_parser_fini(&parser, r); 273 radeon_cs_parser_fini(&parser, r);
274 mutex_unlock(&rdev->cs_mutex); 274 mutex_unlock(&rdev->cs_mutex);
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 87d6b8f36304..49f6700e2ec2 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -642,7 +642,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
642 status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0); 642 status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0);
643 if (status) 643 if (status)
644 dev_err(ctodev(card), 644 dev_err(ctodev(card),
645 "lv1_net_stop_rx_dma faild, %d\n", status); 645 "lv1_net_stop_rx_dma failed, %d\n", status);
646} 646}
647 647
648/** 648/**
@@ -660,7 +660,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card)
660 status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0); 660 status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0);
661 if (status) 661 if (status)
662 dev_err(ctodev(card), 662 dev_err(ctodev(card),
663 "lv1_net_stop_tx_dma faild, status=%d\n", status); 663 "lv1_net_stop_tx_dma failed, status=%d\n", status);
664} 664}
665 665
666/** 666/**
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c
index b8197666021e..4690c8e69207 100644
--- a/drivers/net/tulip/pnic2.c
+++ b/drivers/net/tulip/pnic2.c
@@ -59,7 +59,7 @@
59 * Bit 14:12 - autonegotiation state (write 001 to start autonegotiate) 59 * Bit 14:12 - autonegotiation state (write 001 to start autonegotiate)
60 * Bit 3 - Autopolarity state 60 * Bit 3 - Autopolarity state
61 * Bit 2 - LS10B - link state of 10baseT 0 - good, 1 - failed 61 * Bit 2 - LS10B - link state of 10baseT 0 - good, 1 - failed
62 * Bit 1 - LS100B - link state of 100baseT 0 - good, 1- faild 62 * Bit 1 - LS100B - link state of 100baseT 0 - good, 1 - failed
63 * 63 *
64 * 64 *
65 * Data Port Selection Info 65 * Data Port Selection Info
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index a351bd5d8176..08f95bd3adb3 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -279,7 +279,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev)
279 nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev, 279 nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,
280 &nuc900_rtc_ops, THIS_MODULE); 280 &nuc900_rtc_ops, THIS_MODULE);
281 if (IS_ERR(nuc900_rtc->rtcdev)) { 281 if (IS_ERR(nuc900_rtc->rtcdev)) {
282 dev_err(&pdev->dev, "rtc device register faild\n"); 282 dev_err(&pdev->dev, "rtc device register failed\n");
283 err = PTR_ERR(nuc900_rtc->rtcdev); 283 err = PTR_ERR(nuc900_rtc->rtcdev);
284 goto fail4; 284 goto fail4;
285 } 285 }
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index b020ba7f1cf2..e7d0f525041e 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -241,12 +241,12 @@ static int request_ports(struct bfin_bf54xfb_info *fbi)
241 u16 disp = fbi->mach_info->disp; 241 u16 disp = fbi->mach_info->disp;
242 242
243 if (gpio_request(disp, DRIVER_NAME)) { 243 if (gpio_request(disp, DRIVER_NAME)) {
244 printk(KERN_ERR "Requesting GPIO %d faild\n", disp); 244 printk(KERN_ERR "Requesting GPIO %d failed\n", disp);
245 return -EFAULT; 245 return -EFAULT;
246 } 246 }
247 247
248 if (peripheral_request_list(eppi_req_18, DRIVER_NAME)) { 248 if (peripheral_request_list(eppi_req_18, DRIVER_NAME)) {
249 printk(KERN_ERR "Requesting Peripherals faild\n"); 249 printk(KERN_ERR "Requesting Peripherals failed\n");
250 gpio_free(disp); 250 gpio_free(disp);
251 return -EFAULT; 251 return -EFAULT;
252 } 252 }
@@ -256,7 +256,7 @@ static int request_ports(struct bfin_bf54xfb_info *fbi)
256 u16 eppi_req_24[] = EPPI0_24; 256 u16 eppi_req_24[] = EPPI0_24;
257 257
258 if (peripheral_request_list(eppi_req_24, DRIVER_NAME)) { 258 if (peripheral_request_list(eppi_req_24, DRIVER_NAME)) {
259 printk(KERN_ERR "Requesting Peripherals faild\n"); 259 printk(KERN_ERR "Requesting Peripherals failed\n");
260 peripheral_free_list(eppi_req_18); 260 peripheral_free_list(eppi_req_18);
261 gpio_free(disp); 261 gpio_free(disp);
262 return -EFAULT; 262 return -EFAULT;
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 7a50272eaab9..3cf77676947c 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -192,7 +192,7 @@ static int bfin_t350mcqb_request_ports(int action)
192{ 192{
193 if (action) { 193 if (action) {
194 if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) { 194 if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) {
195 printk(KERN_ERR "Requesting Peripherals faild\n"); 195 printk(KERN_ERR "Requesting Peripherals failed\n");
196 return -EFAULT; 196 return -EFAULT;
197 } 197 }
198 } else 198 } else
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index 4bb6ef822e46..5862ae87ed29 100644
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -508,7 +508,7 @@ static int write_exec(struct page_collect *pcol)
508 508
509 pcol_copy = kmalloc(sizeof(*pcol_copy), GFP_KERNEL); 509 pcol_copy = kmalloc(sizeof(*pcol_copy), GFP_KERNEL);
510 if (!pcol_copy) { 510 if (!pcol_copy) {
511 EXOFS_ERR("write_exec: Faild to kmalloc(pcol)\n"); 511 EXOFS_ERR("write_exec: Failed to kmalloc(pcol)\n");
512 ret = -ENOMEM; 512 ret = -ENOMEM;
513 goto err; 513 goto err;
514 } 514 }
@@ -524,7 +524,7 @@ static int write_exec(struct page_collect *pcol)
524 524
525 ret = exofs_oi_write(oi, ios); 525 ret = exofs_oi_write(oi, ios);
526 if (unlikely(ret)) { 526 if (unlikely(ret)) {
527 EXOFS_ERR("write_exec: exofs_oi_write() Faild\n"); 527 EXOFS_ERR("write_exec: exofs_oi_write() Failed\n");
528 goto err; 528 goto err;
529 } 529 }
530 530
@@ -625,7 +625,7 @@ try_again:
625 /* split the request, next loop will start again */ 625 /* split the request, next loop will start again */
626 ret = write_exec(pcol); 626 ret = write_exec(pcol);
627 if (unlikely(ret)) { 627 if (unlikely(ret)) {
628 EXOFS_DBGMSG("write_exec faild => %d", ret); 628 EXOFS_DBGMSG("write_exec failed => %d", ret);
629 goto fail; 629 goto fail;
630 } 630 }
631 631
@@ -709,7 +709,7 @@ int exofs_write_begin(struct file *file, struct address_space *mapping,
709 ret = simple_write_begin(file, mapping, pos, len, flags, pagep, 709 ret = simple_write_begin(file, mapping, pos, len, flags, pagep,
710 fsdata); 710 fsdata);
711 if (ret) { 711 if (ret) {
712 EXOFS_DBGMSG("simple_write_begin faild\n"); 712 EXOFS_DBGMSG("simple_write_begin failed\n");
713 return ret; 713 return ret;
714 } 714 }
715 715
@@ -722,7 +722,7 @@ int exofs_write_begin(struct file *file, struct address_space *mapping,
722 if (ret) { 722 if (ret) {
723 /*SetPageError was done by _readpage. Is it ok?*/ 723 /*SetPageError was done by _readpage. Is it ok?*/
724 unlock_page(page); 724 unlock_page(page);
725 EXOFS_DBGMSG("__readpage_filler faild\n"); 725 EXOFS_DBGMSG("__readpage_filler failed\n");
726 } 726 }
727 } 727 }
728 728
@@ -1112,7 +1112,7 @@ static void create_done(struct exofs_io_state *ios, void *p)
1112 atomic_dec(&sbi->s_curr_pending); 1112 atomic_dec(&sbi->s_curr_pending);
1113 1113
1114 if (unlikely(ret)) { 1114 if (unlikely(ret)) {
1115 EXOFS_ERR("object=0x%llx creation faild in pid=0x%llx", 1115 EXOFS_ERR("object=0x%llx creation failed in pid=0x%llx",
1116 _LLU(exofs_oi_objno(oi)), _LLU(sbi->layout.s_pid)); 1116 _LLU(exofs_oi_objno(oi)), _LLU(sbi->layout.s_pid));
1117 /*TODO: When FS is corrupted creation can fail, object already 1117 /*TODO: When FS is corrupted creation can fail, object already
1118 * exist. Get rid of this asynchronous creation, if exist 1118 * exist. Get rid of this asynchronous creation, if exist
@@ -1232,7 +1232,7 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
1232 1232
1233 args = kzalloc(sizeof(*args), GFP_KERNEL); 1233 args = kzalloc(sizeof(*args), GFP_KERNEL);
1234 if (!args) { 1234 if (!args) {
1235 EXOFS_DBGMSG("Faild kzalloc of args\n"); 1235 EXOFS_DBGMSG("Failed kzalloc of args\n");
1236 return -ENOMEM; 1236 return -ENOMEM;
1237 } 1237 }
1238 1238
diff --git a/fs/exofs/ios.c b/fs/exofs/ios.c
index 4337cad7777b..95921f501f2f 100644
--- a/fs/exofs/ios.c
+++ b/fs/exofs/ios.c
@@ -55,7 +55,7 @@ int exofs_read_kern(struct osd_dev *od, u8 *cred, struct osd_obj_id *obj,
55 55
56 ret = osd_finalize_request(or, 0, cred, NULL); 56 ret = osd_finalize_request(or, 0, cred, NULL);
57 if (unlikely(ret)) { 57 if (unlikely(ret)) {
58 EXOFS_DBGMSG("Faild to osd_finalize_request() => %d\n", ret); 58 EXOFS_DBGMSG("Failed to osd_finalize_request() => %d\n", ret);
59 goto out; 59 goto out;
60 } 60 }
61 61
@@ -79,7 +79,7 @@ int exofs_get_io_state(struct exofs_layout *layout,
79 */ 79 */
80 ios = kzalloc(exofs_io_state_size(layout->s_numdevs), GFP_KERNEL); 80 ios = kzalloc(exofs_io_state_size(layout->s_numdevs), GFP_KERNEL);
81 if (unlikely(!ios)) { 81 if (unlikely(!ios)) {
82 EXOFS_DBGMSG("Faild kzalloc bytes=%d\n", 82 EXOFS_DBGMSG("Failed kzalloc bytes=%d\n",
83 exofs_io_state_size(layout->s_numdevs)); 83 exofs_io_state_size(layout->s_numdevs));
84 *pios = NULL; 84 *pios = NULL;
85 return -ENOMEM; 85 return -ENOMEM;
@@ -172,7 +172,7 @@ static int exofs_io_execute(struct exofs_io_state *ios)
172 172
173 ret = osd_finalize_request(or, 0, ios->cred, NULL); 173 ret = osd_finalize_request(or, 0, ios->cred, NULL);
174 if (unlikely(ret)) { 174 if (unlikely(ret)) {
175 EXOFS_DBGMSG("Faild to osd_finalize_request() => %d\n", 175 EXOFS_DBGMSG("Failed to osd_finalize_request() => %d\n",
176 ret); 176 ret);
177 return ret; 177 return ret;
178 } 178 }
@@ -365,7 +365,7 @@ static int _add_stripe_unit(struct exofs_io_state *ios, unsigned *cur_pg,
365 365
366 per_dev->bio = bio_kmalloc(GFP_KERNEL, bio_size); 366 per_dev->bio = bio_kmalloc(GFP_KERNEL, bio_size);
367 if (unlikely(!per_dev->bio)) { 367 if (unlikely(!per_dev->bio)) {
368 EXOFS_DBGMSG("Faild to allocate BIO size=%u\n", 368 EXOFS_DBGMSG("Failed to allocate BIO size=%u\n",
369 bio_size); 369 bio_size);
370 return -ENOMEM; 370 return -ENOMEM;
371 } 371 }
@@ -584,7 +584,7 @@ static int _sbi_write_mirror(struct exofs_io_state *ios, int cur_comp)
584 master_dev->bio->bi_max_vecs); 584 master_dev->bio->bi_max_vecs);
585 if (unlikely(!bio)) { 585 if (unlikely(!bio)) {
586 EXOFS_DBGMSG( 586 EXOFS_DBGMSG(
587 "Faild to allocate BIO size=%u\n", 587 "Failed to allocate BIO size=%u\n",
588 master_dev->bio->bi_max_vecs); 588 master_dev->bio->bi_max_vecs);
589 ret = -ENOMEM; 589 ret = -ENOMEM;
590 goto out; 590 goto out;
diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index 7b698f2ec45a..9895595fd2f2 100644
--- a/fs/jfs/jfs_mount.c
+++ b/fs/jfs/jfs_mount.c
@@ -97,7 +97,7 @@ int jfs_mount(struct super_block *sb)
97 97
98 ipaimap = diReadSpecial(sb, AGGREGATE_I, 0); 98 ipaimap = diReadSpecial(sb, AGGREGATE_I, 0);
99 if (ipaimap == NULL) { 99 if (ipaimap == NULL) {
100 jfs_err("jfs_mount: Faild to read AGGREGATE_I"); 100 jfs_err("jfs_mount: Failed to read AGGREGATE_I");
101 rc = -EIO; 101 rc = -EIO;
102 goto errout20; 102 goto errout20;
103 } 103 }
@@ -148,7 +148,7 @@ int jfs_mount(struct super_block *sb)
148 if ((sbi->mntflag & JFS_BAD_SAIT) == 0) { 148 if ((sbi->mntflag & JFS_BAD_SAIT) == 0) {
149 ipaimap2 = diReadSpecial(sb, AGGREGATE_I, 1); 149 ipaimap2 = diReadSpecial(sb, AGGREGATE_I, 1);
150 if (!ipaimap2) { 150 if (!ipaimap2) {
151 jfs_err("jfs_mount: Faild to read AGGREGATE_I"); 151 jfs_err("jfs_mount: Failed to read AGGREGATE_I");
152 rc = -EIO; 152 rc = -EIO;
153 goto errout35; 153 goto errout35;
154 } 154 }
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index f52b5f50299d..58716e73e2a2 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -490,7 +490,7 @@ static int register_trace_probe(struct trace_probe *tp)
490 } 490 }
491 ret = register_probe_event(tp); 491 ret = register_probe_event(tp);
492 if (ret) { 492 if (ret) {
493 pr_warning("Faild to register probe event(%d)\n", ret); 493 pr_warning("Failed to register probe event(%d)\n", ret);
494 goto end; 494 goto end;
495 } 495 }
496 496
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 2bf23406637a..74944a2dd436 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -471,7 +471,7 @@ static int wanrouter_device_setup(struct wan_device *wandev,
471 data = vmalloc(conf->data_size); 471 data = vmalloc(conf->data_size);
472 if (!data) { 472 if (!data) {
473 printk(KERN_INFO 473 printk(KERN_INFO
474 "%s: ERROR, Faild allocate kernel memory !\n", 474 "%s: ERROR, Failed allocate kernel memory !\n",
475 wandev->name); 475 wandev->name);
476 kfree(conf); 476 kfree(conf);
477 return -ENOBUFS; 477 return -ENOBUFS;
@@ -481,7 +481,7 @@ static int wanrouter_device_setup(struct wan_device *wandev,
481 err = wandev->setup(wandev, conf); 481 err = wandev->setup(wandev, conf);
482 } else { 482 } else {
483 printk(KERN_INFO 483 printk(KERN_INFO
484 "%s: ERROR, Faild to copy from user data !\n", 484 "%s: ERROR, Failed to copy from user data !\n",
485 wandev->name); 485 wandev->name);
486 err = -EFAULT; 486 err = -EFAULT;
487 } 487 }