From a9d7e794ea66902a255be6e87f633286d04c2b39 Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Sat, 24 Mar 2012 09:00:04 -0700 Subject: r8169.c: fix comment typo The below patch fixes a typo that I found while reading the code. Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 7a0c800b50a..7f06508df9f 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4267,7 +4267,7 @@ static int rtl8169_open(struct net_device *dev) pm_runtime_get_sync(&pdev->dev); /* - * Rx and Tx desscriptors needs 256 bytes alignment. + * Rx and Tx descriptors needs 256 bytes alignment. * dma_alloc_coherent provides more. */ tp->TxDescArray = dma_alloc_coherent(&pdev->dev, R8169_TX_RING_BYTES, -- cgit v1.2.3-70-g09d2 From 409a3e98132c3a4f2aa2854995f8a9dd16cf11ac Mon Sep 17 00:00:00 2001 From: Jonathan Woithe Date: Tue, 27 Mar 2012 13:01:01 +1030 Subject: Email/web address change This patch updates Jonathan Woithe's contact details across the kernel tree. Signed-off-by: Jonathan Woithe Signed-off-by: Jiri Kosina --- CREDITS | 4 ++-- Documentation/sound/oss/ALS | 4 ++-- MAINTAINERS | 2 +- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- sound/isa/als100.c | 2 +- sound/pci/hda/patch_realtek.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers') diff --git a/CREDITS b/CREDITS index 370b4c7da39..d8fe12a9421 100644 --- a/CREDITS +++ b/CREDITS @@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer D: Author of the longest-living linux bug N: Jonathan Woithe -E: jwoithe@physics.adelaide.edu.au -W: http://www.physics.adelaide.edu.au/~jwoithe +E: jwoithe@just42.net +W: http:/www.just42.net/jwoithe D: ALS-007 sound card extensions to Sound Blaster driver S: 20 Jordan St S: Valley View, SA 5093 diff --git a/Documentation/sound/oss/ALS b/Documentation/sound/oss/ALS index d01ffbfd580..bf10bed4574 100644 --- a/Documentation/sound/oss/ALS +++ b/Documentation/sound/oss/ALS @@ -57,10 +57,10 @@ The resulting sound driver will provide the following capabilities: DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono). Jonathan Woithe -jwoithe@physics.adelaide.edu.au +jwoithe@just42.net 30 March 1998 Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200 Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info. -Modified 2000-11-19 by Jonathan Woithe, jwoithe@physics.adelaide.edu.au +Modified 2000-11-19 by Jonathan Woithe, jwoithe@just42.net - updated information for kernel 2.4.x. diff --git a/MAINTAINERS b/MAINTAINERS index 252972b6c4a..1435e6a83da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2839,7 +2839,7 @@ S: Maintained F: arch/frv/ FUJITSU LAPTOP EXTRAS -M: Jonathan Woithe +M: Jonathan Woithe L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/fujitsu-laptop.c diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 6b26666b37f..c4c1a5444b3 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -1,7 +1,7 @@ /*-*-linux-c-*-*/ /* - Copyright (C) 2007,2008 Jonathan Woithe + Copyright (C) 2007,2008 Jonathan Woithe Copyright (C) 2008 Peter Gruber Copyright (C) 2008 Tony Vroon Based on earlier work: diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 856ad92c40d..26844514ac5 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -110,7 +110,7 @@ UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), -/* Deduced by Jonathan Woithe +/* Deduced by Jonathan Woithe * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message * always fails and confuses drive. */ diff --git a/sound/isa/als100.c b/sound/isa/als100.c index d1f4351fb6e..2d67c78c9f4 100644 --- a/sound/isa/als100.c +++ b/sound/isa/als100.c @@ -7,7 +7,7 @@ Thanks to Pierfrancesco 'qM2' Passerini. Generalised for soundcards based on DT-0196 and ALS-007 chips - by Jonathan Woithe : June 2002. + by Jonathan Woithe : June 2002. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a8e82be3d2f..f6316507d76 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6,7 +6,7 @@ * Copyright (c) 2004 Kailang Yang * PeiSen Hou * Takashi Iwai - * Jonathan Woithe + * Jonathan Woithe * * This driver is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3-70-g09d2 From a03abdcb8e537912c9c44f283747b995d1788d23 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Mon, 2 Apr 2012 09:42:22 +0400 Subject: w1: fix slave driver registration error message W1 core prints "Failed to register master driver" if error happens on registering SLAVE driver. Fix it. Signed-off-by: Dmitry Artamonow Acked-by: Evgeniy Polyakov Signed-off-by: Jiri Kosina --- drivers/w1/w1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 9761950697b..2f2e894ea0c 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -1027,7 +1027,7 @@ static int __init w1_init(void) retval = driver_register(&w1_slave_driver); if (retval) { printk(KERN_ERR - "Failed to register master driver. err=%d.\n", + "Failed to register slave driver. err=%d.\n", retval); goto err_out_master_unregister; } -- cgit v1.2.3-70-g09d2 From 91fe4d508f29d71133e9a82ebdc1f2274c514b70 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Fri, 17 Feb 2012 17:46:21 +0100 Subject: Fix typo milivolt => millivolt Signed-off-by: Thomas Weber Signed-off-by: Jiri Kosina --- Documentation/hwmon/wm831x | 2 +- drivers/mfd/tps65911-comparator.c | 2 +- drivers/power/bq27x00_battery.c | 2 +- drivers/regulator/tps65910-regulator.c | 20 ++++++++++---------- include/linux/mfd/wm831x/pdata.h | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'drivers') diff --git a/Documentation/hwmon/wm831x b/Documentation/hwmon/wm831x index 24f47d8f6a4..11446757c8c 100644 --- a/Documentation/hwmon/wm831x +++ b/Documentation/hwmon/wm831x @@ -22,7 +22,7 @@ reporting of all the input values but does not provide any alarms. Voltage Monitoring ------------------ -Voltages are sampled by a 12 bit ADC. Voltages in milivolts are 1.465 +Voltages are sampled by a 12 bit ADC. Voltages in millivolts are 1.465 times the ADC value. Temperature Monitoring diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c index e7ff783aa31..5a62e6bf89a 100644 --- a/drivers/mfd/tps65911-comparator.c +++ b/drivers/mfd/tps65911-comparator.c @@ -26,7 +26,7 @@ #define COMP1 1 #define COMP2 2 -/* Comparator 1 voltage selection table in milivolts */ +/* Comparator 1 voltage selection table in millivolts */ static const u16 COMP_VSEL_TABLE[] = { 0, 2500, 2500, 2500, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850, 2900, 2950, 3000, 3050, diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index cd1545f57f4..241848745e2 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -456,7 +456,7 @@ static int bq27x00_battery_capacity_level(struct bq27x00_device_info *di, } /* - * Return the battery Voltage in milivolts + * Return the battery Voltage in millivolts * Or < 0 if something fails. */ static int bq27x00_battery_voltage(struct bq27x00_device_info *di, diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 5c15ba01e9c..1711dbf28ea 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -27,54 +27,54 @@ #define TPS65910_SUPPLY_STATE_ENABLED 0x1 -/* supported VIO voltages in milivolts */ +/* supported VIO voltages in millivolts */ static const u16 VIO_VSEL_table[] = { 1500, 1800, 2500, 3300, }; /* VSEL tables for TPS65910 specific LDOs and dcdc's */ -/* supported VDD3 voltages in milivolts */ +/* supported VDD3 voltages in millivolts */ static const u16 VDD3_VSEL_table[] = { 5000, }; -/* supported VDIG1 voltages in milivolts */ +/* supported VDIG1 voltages in millivolts */ static const u16 VDIG1_VSEL_table[] = { 1200, 1500, 1800, 2700, }; -/* supported VDIG2 voltages in milivolts */ +/* supported VDIG2 voltages in millivolts */ static const u16 VDIG2_VSEL_table[] = { 1000, 1100, 1200, 1800, }; -/* supported VPLL voltages in milivolts */ +/* supported VPLL voltages in millivolts */ static const u16 VPLL_VSEL_table[] = { 1000, 1100, 1800, 2500, }; -/* supported VDAC voltages in milivolts */ +/* supported VDAC voltages in millivolts */ static const u16 VDAC_VSEL_table[] = { 1800, 2600, 2800, 2850, }; -/* supported VAUX1 voltages in milivolts */ +/* supported VAUX1 voltages in millivolts */ static const u16 VAUX1_VSEL_table[] = { 1800, 2500, 2800, 2850, }; -/* supported VAUX2 voltages in milivolts */ +/* supported VAUX2 voltages in millivolts */ static const u16 VAUX2_VSEL_table[] = { 1800, 2800, 2900, 3300, }; -/* supported VAUX33 voltages in milivolts */ +/* supported VAUX33 voltages in millivolts */ static const u16 VAUX33_VSEL_table[] = { 1800, 2000, 2800, 3300, }; -/* supported VMMC voltages in milivolts */ +/* supported VMMC voltages in millivolts */ static const u16 VMMC_VSEL_table[] = { 1800, 2800, 3000, 3300, }; diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index 1d7a3f7b3b5..dcc9631b305 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h @@ -26,7 +26,7 @@ struct wm831x_backlight_pdata { struct wm831x_backup_pdata { int charger_enable; int no_constant_voltage; /** Disable constant voltage charging */ - int vlim; /** Voltage limit in milivolts */ + int vlim; /** Voltage limit in millivolts */ int ilim; /** Current limit in microamps */ }; -- cgit v1.2.3-70-g09d2 From cde0e2ccb86766a874125a400c1784bd5fa56074 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 19 Feb 2012 16:11:59 +0100 Subject: fbdev: s/#if CONFIG/#ifdef CONFIG/ Signed-off-by: Geert Uytterhoeven Acked-by: Florian Tobias Schandinat Signed-off-by: Jiri Kosina --- drivers/video/au1100fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index de9da6774fd..4da189562a3 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c @@ -532,7 +532,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev) for (page = (unsigned long)fbdev->fb_mem; page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len); page += PAGE_SIZE) { -#if CONFIG_DMA_NONCOHERENT +#ifdef CONFIG_DMA_NONCOHERENT SetPageReserved(virt_to_page(CAC_ADDR((void *)page))); #else SetPageReserved(virt_to_page(page)); -- cgit v1.2.3-70-g09d2 From 04bd27aed1459ff4d63d1ab6b0ac26b1e550a121 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 26 Feb 2012 23:51:53 +0100 Subject: radeon: remove redundant ';' from radeon_vm_bo_update_pte() return statement needs just one semi-colon Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/gpu/drm/radeon/radeon_gart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index 010dad8b66a..d5b1adc457a 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c @@ -551,7 +551,7 @@ int radeon_vm_bo_update_pte(struct radeon_device *rdev, /* nothing to do if vm isn't bound */ if (vm->id == -1) - return 0;; + return 0; bo_va = radeon_bo_va(bo, vm); if (bo_va == NULL) { -- cgit v1.2.3-70-g09d2 From 2975b0231600f4628512d51550a4e2cfde7d6358 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 28 Feb 2012 10:49:36 -0800 Subject: scsi: Use vsprintf extention %pf with builtin_return_address Emit the function name not the address when possible. builtin_return_address() gives an address. When building a kernel with CONFIG_KALLSYMS, emit the actual function name not the address. Signed-off-by: Joe Perches Acked-by: David S. Miller Signed-off-by: Jiri Kosina --- drivers/scsi/esp_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 394ed9e79fd..34552bf1c02 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c @@ -1000,7 +1000,7 @@ static int esp_check_spur_intr(struct esp *esp) static void esp_schedule_reset(struct esp *esp) { - esp_log_reset("ESP: esp_schedule_reset() from %p\n", + esp_log_reset("ESP: esp_schedule_reset() from %pf\n", __builtin_return_address(0)); esp->flags |= ESP_FLAG_RESETTING; esp_event(esp, ESP_EVENT_RESET); -- cgit v1.2.3-70-g09d2 From bfa346ad6b4dd88c19f560b5b0527d93fa05833b Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 28 Feb 2012 10:49:38 -0800 Subject: gadget: Use vsprintf extention %pf with builtin_return_address Emit the function name not the address when possible. builtin_return_address() gives an address. When building a kernel with CONFIG_KALLSYMS, emit the actual function name not the address. Signed-off-by: Joe Perches Acked-by: Felipe Balbi Signed-off-by: Jiri Kosina --- drivers/usb/gadget/u_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 6597a6813e4..a553beeb86d 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -920,7 +920,7 @@ static int gs_put_char(struct tty_struct *tty, unsigned char ch) unsigned long flags; int status; - pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %p\n", + pr_vdebug("gs_put_char: (%d,%p) char=0x%x, called from %pf\n", port->port_num, tty, ch, __builtin_return_address(0)); spin_lock_irqsave(&port->port_lock, flags); -- cgit v1.2.3-70-g09d2 From 4deb508e91624ab0ff1812825870c7dcf7812690 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Tue, 28 Feb 2012 10:49:35 -0800 Subject: parisc: Use vsprintf extention %pf with builtin_return_address Emit the function name not the address when possible. builtin_return_address() gives an address. When building a kernel with CONFIG_KALLSYMS, emit the actual function name not the address. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina --- drivers/parisc/superio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index e3b76d409de..5003458980d 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -348,7 +348,7 @@ int superio_fixup_irq(struct pci_dev *pcidev) BUG(); return -1; } - printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %p\n", + printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %pf\n", pci_name(pcidev), pcidev->vendor, pcidev->device, __builtin_return_address(0)); -- cgit v1.2.3-70-g09d2 From 86d2f6fbb957e7500e5140a698db9a6643a1f453 Mon Sep 17 00:00:00 2001 From: Octavian Moraru Date: Sat, 3 Mar 2012 16:19:39 +0200 Subject: mtg: docg3: fix comment errors occured ==> occurred successfull ==> successful adressing ==> addressing Signed-off-by: Octavian Moraru Signed-off-by: Jiri Kosina --- drivers/mtd/devices/docg3.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers') diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index ad11ef0a81f..9afda6950df 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@ -388,7 +388,7 @@ static void doc_set_device_id(struct docg3 *docg3, int id) * leveling counters are stored. To access this last area of 4 bytes, a special * mode must be input to the flash ASIC. * - * Returns 0 if no error occured, -EIO else. + * Returns 0 if no error occurred, -EIO else. */ static int doc_set_extra_page_mode(struct docg3 *docg3) { @@ -685,7 +685,7 @@ out: * - one read of 512 bytes at offset 0 * - one read of 512 bytes at offset 512 + 16 * - * Returns 0 if successful, -EIO if a read error occured. + * Returns 0 if successful, -EIO if a read error occurred. */ static int doc_read_page_prepare(struct docg3 *docg3, int block0, int block1, int page, int offset) @@ -843,7 +843,7 @@ static void calc_block_sector(loff_t from, int *block0, int *block1, int *page, * * Reads flash memory OOB area of pages. * - * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured + * Returns 0 if read successful, of -EIO, -EINVAL if an error occurred */ static int doc_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops) @@ -971,7 +971,7 @@ err: * Reads flash memory pages. This function does not read the OOB chunk, but only * the page data. * - * Returns 0 if read successfull, of -EIO, -EINVAL if an error occured + * Returns 0 if read successful, of -EIO, -EINVAL if an error occurred */ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) @@ -1109,7 +1109,7 @@ static int doc_get_op_status(struct docg3 *docg3) * Wait for the chip to be ready again after erase or write operation, and check * erase/write status. * - * Returns 0 if erase successfull, -EIO if erase/write issue, -ETIMEOUT if + * Returns 0 if erase successful, -EIO if erase/write issue, -ETIMEOUT if * timeout */ static int doc_write_erase_wait_status(struct docg3 *docg3) @@ -1186,7 +1186,7 @@ static int doc_erase_block(struct docg3 *docg3, int block0, int block1) * Erase a bunch of contiguous blocks, by pairs, as a "mtd" page of 1024 is * split into 2 pages of 512 bytes on 2 contiguous blocks. * - * Returns 0 if erase successful, -EINVAL if adressing error, -EIO if erase + * Returns 0 if erase successful, -EINVAL if addressing error, -EIO if erase * issue */ static int doc_erase(struct mtd_info *mtd, struct erase_info *info) @@ -1395,7 +1395,7 @@ static int doc_backup_oob(struct docg3 *docg3, loff_t to, * Or provide data without OOB, and then a all zeroed OOB will be used (ECC will * still be filled in if asked for). * - * Returns 0 is successfull, EINVAL if length is not 14 bytes + * Returns 0 is successful, EINVAL if length is not 14 bytes */ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, struct mtd_oob_ops *ops) @@ -1922,7 +1922,7 @@ static void doc_release_device(struct mtd_info *mtd) * docg3_resume - Awakens docg3 floor * @pdev: platfrom device * - * Returns 0 (always successfull) + * Returns 0 (always successful) */ static int docg3_resume(struct platform_device *pdev) { -- cgit v1.2.3-70-g09d2 From b6cafa274d4fb272535ba75c714d25c05609146c Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Mon, 27 Feb 2012 23:28:38 +0900 Subject: radeon: Fix typo in radeon_gem.c Correct spelling "withou" to "without" in drivers/gpu/drm/radeon/radeon_gem.c Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index c7008b5210f..0519b05968b 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -91,7 +91,7 @@ int radeon_gem_set_domain(struct drm_gem_object *gobj, } if (!domain) { /* Do nothings */ - printk(KERN_WARNING "Set domain withou domain !\n"); + printk(KERN_WARNING "Set domain without domain !\n"); return 0; } if (domain == RADEON_GEM_DOMAIN_CPU) { -- cgit v1.2.3-70-g09d2 From 3b729f7647875624dc498b65f3244b2edc9f4a07 Mon Sep 17 00:00:00 2001 From: Santosh Y Date: Sun, 8 Apr 2012 18:47:09 +0530 Subject: scsi: fix comment spelling fix recory->recovery Signed-off-by: Santosh Y Signed-off-by: Jiri Kosina --- drivers/scsi/scsi_error.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 2cfcbffa41f..fbda664f584 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -664,7 +664,7 @@ static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd) } /** - * scsi_eh_prep_cmnd - Save a scsi command info as part of error recory + * scsi_eh_prep_cmnd - Save a scsi command info as part of error recovery * @scmd: SCSI command structure to hijack * @ses: structure to save restore information * @cmnd: CDB to send. Can be NULL if no new cmnd is needed @@ -739,7 +739,7 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, EXPORT_SYMBOL(scsi_eh_prep_cmnd); /** - * scsi_eh_restore_cmnd - Restore a scsi command info as part of error recory + * scsi_eh_restore_cmnd - Restore a scsi command info as part of error recovery * @scmd: SCSI command structure to restore * @ses: saved information from a coresponding call to scsi_eh_prep_cmnd * @@ -762,7 +762,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) EXPORT_SYMBOL(scsi_eh_restore_cmnd); /** - * scsi_send_eh_cmnd - submit a scsi command as part of error recory + * scsi_send_eh_cmnd - submit a scsi command as part of error recovery * @scmd: SCSI command structure to hijack * @cmnd: CDB to send * @cmnd_size: size in bytes of @cmnd -- cgit v1.2.3-70-g09d2 From b40b26ccfc31465363dbd3ff849bd84ec87fe9b7 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 12 Apr 2012 00:05:29 +0200 Subject: gma500: Don't needlessly include version.h in mdfld_dsi_output.h drivers/gpu/drm/gma500/mdfld_dsi_output.h does not need to '#include ' - so don't. Signed-off-by: Jesper Juhl Acked-by: Alan Cox Acked-by: Kirill A. Shutemov Signed-off-by: Jiri Kosina --- drivers/gpu/drm/gma500/mdfld_dsi_output.h | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h index 21071cef92a..36eb0744841 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h +++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h @@ -29,7 +29,6 @@ #define __MDFLD_DSI_OUTPUT_H__ #include -#include #include #include #include -- cgit v1.2.3-70-g09d2 From 6b2aac42b20f495d9ea220036f57596d525d4233 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 14 Apr 2012 00:14:11 +0900 Subject: Fix typo in various Kconfig file Correct spelling typo in various Kconfig file. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- arch/m68k/Kconfig.cpu | 2 +- arch/mips/Kconfig | 4 ++-- arch/mips/Kconfig.debug | 2 +- arch/openrisc/Kconfig | 2 +- arch/powerpc/platforms/Kconfig.cputype | 4 ++-- arch/powerpc/platforms/pseries/Kconfig | 2 +- arch/sh/Kconfig.cpu | 2 +- drivers/devfreq/Kconfig | 2 +- drivers/hid/Kconfig | 2 +- drivers/hwmon/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/mfd/Kconfig | 6 +++--- drivers/ptp/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- drivers/xen/Kconfig | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) (limited to 'drivers') diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 8a9c767125a..51b3274cbe7 100644 --- a/arch/m68k/Kconfig.cpu +++ b/arch/m68k/Kconfig.cpu @@ -7,7 +7,7 @@ choice help The Freescale (was Motorola) M68K family of processors implements the full 68000 processor instruction set. - The Freescale ColdFire family of processors is a modern derivitive + The Freescale ColdFire family of processors is a modern derivative of the 68000 processor family. They are mainly targeted at embedded applications, and are all System-On-Chip (SOC) devices, as opposed to stand alone CPUs. They implement a subset of the original 68000 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ce30e2f91d7..923a6c3b9a0 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1001,12 +1001,12 @@ config HOLES_IN_ZONE bool # -# Endianess selection. Sufficiently obscure so many users don't know what to +# Endianness selection. Sufficiently obscure so many users don't know what to # answer,so we try hard to limit the available choices. Also the use of a # choice statement should be more obvious to the user. # choice - prompt "Endianess selection" + prompt "Endianness selection" help Some MIPS machines can be configured for either little or big endian byte order. These modes require different kernels and a different diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 83ed00a5644..5a43aa0798c 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug @@ -57,7 +57,7 @@ config CMDLINE options. config CMDLINE_OVERRIDE - bool "Built-in command line overrides firware arguments" + bool "Built-in command line overrides firmware arguments" default n depends on CMDLINE_BOOL help diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index a4787197d8f..66dff204698 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -141,7 +141,7 @@ config DEBUG_STACKOVERFLOW bool "Check for kernel stack overflow" default y help - Make extra checks for space avaliable on stack in some + Make extra checks for space available on stack in some critical functions. This will cause kernel to run a bit slower, but will catch most of kernel stack overruns and exit gracefuly. diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 425db18580a..9c80fc07384 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -258,7 +258,7 @@ config PPC_ICSWX_PID default y ---help--- The PID register in server is used explicitly for ICSWX. In - embedded systems PID managment is done by the system. + embedded systems PID management is done by the system. config PPC_ICSWX_USE_SIGILL bool "Should a bad CT cause a SIGILL?" @@ -266,7 +266,7 @@ config PPC_ICSWX_USE_SIGILL default n ---help--- Should a bad CT used for "non-record form ICSWX" cause an - illegal intruction signal or should it be silent as + illegal instruction signal or should it be silent as architected. If in doubt, say N here. diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index aadbe4f6d53..10ad207dccc 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -67,7 +67,7 @@ config IO_EVENT_IRQ This option will only enable the IO event platform code. You will still need to enable or compile the actual drivers - that use this infrastruture to handle IO event interrupts. + that use this infrastructure to handle IO event interrupts. Say Y if you are unsure. diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index ddf096c7d8b..770ff2d5b94 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu @@ -1,7 +1,7 @@ menu "Processor features" choice - prompt "Endianess selection" + prompt "Endianness selection" default CPU_LITTLE_ENDIAN help Some SuperH machines can be configured for either little or big diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 464fa2147df..f6b0a6e2ea5 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -16,7 +16,7 @@ menuconfig PM_DEVFREQ is attached to a single device and returns a "representative" clock frequency of the device, which is also attached to a device by 1-to-1. The device registering devfreq takes the - responsiblity to "interpret" the representative frequency and + responsibility to "interpret" the representative frequency and to set its every clock accordingly with the "target" callback given to devfreq. diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a3d03325299..478eb4a90f2 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -448,7 +448,7 @@ config HID_PICOLCD_FB select FB_SYS_FOPS ---help--- Provide access to PicoLCD's 256x64 monochrome display via a - frambuffer device. + framebuffer device. config HID_PICOLCD_BACKLIGHT bool "Backlight control" if EXPERT diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 8deedc1b984..e466ecba8dc 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -318,7 +318,7 @@ config SENSORS_EXYNOS4_TMU tristate "Temperature sensor on Samsung EXYNOS4" depends on ARCH_EXYNOS4 help - If you say yes here you get support for TMU (Thermal Managment + If you say yes here you get support for TMU (Thermal Management Unit) on SAMSUNG EXYNOS4 series of SoC. This driver can also be built as a module. If so, the module diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d2c5095deea..94468a64ce3 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -351,7 +351,7 @@ config I2C_DAVINCI For details please see http://www.ti.com/davinci config I2C_DESIGNWARE_PLATFORM - tristate "Synopsys DesignWare Platfrom" + tristate "Synopsys DesignWare Platform" depends on HAVE_CLK help If you say yes to this option, support will be included for the diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 29f463cc09c..639e1fc36a3 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -407,7 +407,7 @@ config MFD_MAX8925 select MFD_CORE help Say yes here to support for Maxim Semiconductor MAX8925. This is - a Power Management IC. This driver provies common support for + a Power Management IC. This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device. @@ -430,7 +430,7 @@ config MFD_MAX8998 help Say yes here to support for Maxim Semiconductor MAX8998 and National Semiconductor LP3974. This is a Power Management IC. - This driver provies common support for accessing the device, + This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device. @@ -441,7 +441,7 @@ config MFD_S5M_CORE select REGMAP_I2C help Support for the Samsung Electronics S5M MFD series. - This driver provies common support for accessing the device, + This driver provides common support for accessing the device, additional drivers must be enabled in order to use the functionality of the device diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index cd9bc3b129b..b4b918a75db 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -70,7 +70,7 @@ config DP83640_PHY using the SO_TIMESTAMPING API. In order for this to work, your MAC driver must also - implement the skb_tx_timetamp() function. + implement the skb_tx_timestamp() function. config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 37096246c93..eeea76f4dcc 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -937,7 +937,7 @@ config BCM47XX_WDT tristate "Broadcom BCM47xx Watchdog Timer" depends on BCM47XX help - Hardware driver for the Broadcom BCM47xx Watchog Timer. + Hardware driver for the Broadcom BCM47xx Watchdog Timer. config RC32434_WDT tristate "IDT RC32434 SoC Watchdog Timer" diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 94243136f6b..73f1c99bc54 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -71,7 +71,7 @@ config XEN_DEV_EVTCHN tristate "Xen /dev/xen/evtchn device" default y help - The evtchn driver allows a userspace process to triger event + The evtchn driver allows a userspace process to trigger event channels and to receive notification of an event channel firing. If in doubt, say yes. -- cgit v1.2.3-70-g09d2 From 59bf896406471ac49d124b3e5f4edcafe28e5360 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 18 Apr 2012 00:01:21 +0900 Subject: Fix "the the" in various Kconfig Fix typo "the the" in various Kconfig. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- arch/arm/Kconfig | 4 ++-- arch/arm/mach-s3c64xx/Kconfig | 4 ++-- arch/blackfin/Kconfig | 2 +- drivers/iommu/Kconfig | 4 ++-- drivers/net/can/sja1000/Kconfig | 2 +- drivers/net/irda/Kconfig | 2 +- kernel/trace/Kconfig | 2 +- sound/soc/imx/Kconfig | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cf006d40342..73f90dd5554 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1927,10 +1927,10 @@ choice default ZBOOT_ROM_NONE help Include experimental SD/MMC loading code in the ROM-able zImage. - With this enabled it is possible to write the the ROM-able zImage + With this enabled it is possible to write the ROM-able zImage kernel image to an MMC or SD card and boot the kernel straight from the reset vector. At reset the processor Mask ROM will load - the first part of the the ROM-able zImage which in turn loads the + the first part of the ROM-able zImage which in turn loads the rest the kernel image to RAM. config ZBOOT_ROM_NONE diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 82c0915729e..06ca1cd4cae 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -210,7 +210,7 @@ config SMDK6410_WM1190_EV1 and audio daughtercard for the Samsung SMDK6410 reference platform. Enabling this option will build support for this module into the kernel. The presence of the module will be - detected at runtime so the the resulting kernel can be used + detected at runtime so the resulting kernel can be used with or without the 1190-EV1 fitted. config SMDK6410_WM1192_EV1 @@ -226,7 +226,7 @@ config SMDK6410_WM1192_EV1 daughtercard for the Samsung SMDK6410 reference platform. Enabling this option will build support for this module into the kernel. The presence of the daughtercard will be - detected at runtime so the the resulting kernel can be used + detected at runtime so the resulting kernel can be used with or without the 1192-EV1 fitted. config MACH_NCP diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 373a6902d8f..b83e89ced98 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -1258,7 +1258,7 @@ config PM_BFIN_WAKE_GP (all processors, except ADSP-BF549). This option sets the general-purpose wake-up enable (GPWE) control bit to enable wake-up upon detection of an active low signal on the /GPW (PH7) pin. - On ADSP-BF549 this option enables the the same functionality on the + On ADSP-BF549 this option enables the same functionality on the /MRXON pin also PH7. endmenu diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 3bd9fff5c58..c69843742bb 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -43,7 +43,7 @@ config AMD_IOMMU With this option you can enable support for AMD IOMMU hardware in your system. An IOMMU is a hardware component which provides remapping of DMA memory accesses from devices. With an AMD IOMMU you - can isolate the the DMA memory of different devices and protect the + can isolate the DMA memory of different devices and protect the system from misbehaving device drivers or hardware. You can find out if your system has an AMD IOMMU if you look into @@ -67,7 +67,7 @@ config AMD_IOMMU_V2 ---help--- This option enables support for the AMD IOMMUv2 features of the IOMMU hardware. Select this option if you want to use devices that support - the the PCI PRI and PASID interface. + the PCI PRI and PASID interface. # Intel IOMMU support config DMAR_TABLE diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig index b60d6c5f29a..03df9a8f2bb 100644 --- a/drivers/net/can/sja1000/Kconfig +++ b/drivers/net/can/sja1000/Kconfig @@ -75,7 +75,7 @@ config CAN_KVASER_PCI tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" depends on PCI ---help--- - This driver is for the the PCIcanx and PCIcan cards (1, 2 or + This driver is for the PCIcanx and PCIcan cards (1, 2 or 4 channel) from Kvaser (http://www.kvaser.com). config CAN_PLX_PCI diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 468047866c8..1b6d5c03edf 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig @@ -316,7 +316,7 @@ config AU1000_FIR tristate "Alchemy IrDA SIR/FIR" depends on IRDA && MIPS_ALCHEMY help - Say Y/M here to build suppor the the IrDA peripheral on the + Say Y/M here to build support the IrDA peripheral on the Alchemy Au1000 and Au1100 SoCs. Say M to build a module; it will be called au1k_ir.ko diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index a1d2849f247..33f768b779c 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -272,7 +272,7 @@ config PROFILE_ANNOTATED_BRANCHES bool "Trace likely/unlikely profiler" select TRACE_BRANCH_PROFILING help - This tracer profiles all the the likely and unlikely macros + This tracer profiles all likely and unlikely macros in the kernel. It will display the results in: /sys/kernel/debug/tracing/trace_stat/branch_annotated diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 810acaa0900..d83e5d0b5d5 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -28,7 +28,7 @@ config SND_SOC_IMX_AUDMUX tristate config SND_MXC_SOC_WM1133_EV1 - tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" + tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted" depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL select SND_SOC_WM8350 select SND_MXC_SOC_FIQ -- cgit v1.2.3-70-g09d2 From c69a6ca1a4e398e7e85cab792ddbd874d9335233 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:49:57 +0200 Subject: radeon_cp: Remove unneeded tests for NULL before calling release_firmware() release_firmware() does its own tests for NULL pointers so there's no need to explicitly test before calling it. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/gpu/drm/radeon/radeon_cp.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 0ebb7d4796f..ef67e181377 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c @@ -1827,14 +1827,10 @@ void radeon_do_release(struct drm_device * dev) r600_do_cleanup_cp(dev); else radeon_do_cleanup_cp(dev); - if (dev_priv->me_fw) { - release_firmware(dev_priv->me_fw); - dev_priv->me_fw = NULL; - } - if (dev_priv->pfp_fw) { - release_firmware(dev_priv->pfp_fw); - dev_priv->pfp_fw = NULL; - } + release_firmware(dev_priv->me_fw); + dev_priv->me_fw = NULL; + release_firmware(dev_priv->pfp_fw); + dev_priv->pfp_fw = NULL; } } -- cgit v1.2.3-70-g09d2 From b2cbf2e31bd26abaddcb1ce4cefb09e025247d52 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:10 +0200 Subject: typhoon: get rid of redundant conditional before all to release_firmware() There's no need to test for a NULL pointer before calling release_firmware() since the function does that check itself, so remove the redundant test. Signed-off-by: Jesper Juhl Acked-by: David Dillow Signed-off-by: Jiri Kosina --- drivers/net/ethernet/3com/typhoon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 1234a14b2b7..b1536663514 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -2549,8 +2549,7 @@ typhoon_init(void) static void __exit typhoon_cleanup(void) { - if (typhoon_fw) - release_firmware(typhoon_fw); + release_firmware(typhoon_fw); pci_unregister_driver(&typhoon_driver); } -- cgit v1.2.3-70-g09d2 From e3c5530b96b9c5994cfb2544a037161790c4f7c3 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:15 +0200 Subject: tg3: remove redundant NULL test before release_firmware() call There is no need to test for a NULL pointer before calling release_firmware - the function does that on its own. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/net/ethernet/broadcom/tg3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 062ac333fde..9fbf73e41e3 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -15842,8 +15842,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev) if (dev) { struct tg3 *tp = netdev_priv(dev); - if (tp->fw) - release_firmware(tp->fw); + release_firmware(tp->fw); tg3_reset_task_cancel(tp); -- cgit v1.2.3-70-g09d2 From 294ca868ed598519cab1cd699873378d46733198 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:24 +0200 Subject: bna: remove redundant NULL test before release_firmware() release_firmware() does its own NULL test so explicit test before call is unneeded. Signed-off-by: Jesper Juhl Acked-by: Rasesh Mody Signed-off-by: Jiri Kosina --- drivers/net/ethernet/brocade/bna/bnad.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index ff78f770dec..d86390cc033 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -3546,9 +3546,7 @@ static void __exit bnad_module_exit(void) { pci_unregister_driver(&bnad_pci_driver); - - if (bfi_fw) - release_firmware(bfi_fw); + release_firmware(bfi_fw); } module_init(bnad_module_init); -- cgit v1.2.3-70-g09d2 From 62baaf34dd6cbd3bb5357972789edd2d7d70c206 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:31 +0200 Subject: qlogic: get rid of a redundant test for NULL before call to release_firmware() Since release_firmware() deals gracefully with being passed a NULL pointer there is no reason to test explicitly before calling the function. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +-- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index 718b2744035..1fb149c9b30 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c @@ -1261,8 +1261,7 @@ next: void netxen_release_firmware(struct netxen_adapter *adapter) { - if (adapter->fw) - release_firmware(adapter->fw); + release_firmware(adapter->fw); adapter->fw = NULL; } diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index d32cf0ddf1b..799fd40ed03 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -1321,8 +1321,7 @@ next: void qlcnic_release_firmware(struct qlcnic_adapter *adapter) { - if (adapter->fw) - release_firmware(adapter->fw); + release_firmware(adapter->fw); adapter->fw = NULL; } -- cgit v1.2.3-70-g09d2 From 53c0ad522e215251f55623e80b921129aafa0d48 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:50:42 +0200 Subject: tehuti: delete redundant NULL check before release_firmware() release_firmware() checks for NULL pointers - no need to test before the call. Signed-off-by: Jesper Juhl Signed-off-by: Andy Gospodarek Signed-off-by: Jiri Kosina --- drivers/net/ethernet/tehuti/tehuti.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index ad973ffc9ff..a445e777f08 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c @@ -341,8 +341,8 @@ static int bdx_fw_load(struct bdx_priv *priv) out: if (master) WRITE_REG(priv, regINIT_SEMAPHORE, 1); - if (fw) - release_firmware(fw); + + release_firmware(fw); if (rc) { netdev_err(priv->ndev, "firmware loading failed\n"); -- cgit v1.2.3-70-g09d2 From ee51f4432e375d07c29758e592c8c1ad1a343208 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:51:30 +0200 Subject: aic94xx: Get rid of redundant NULL check before release_firmware() call release_firmware() checks for NULL pointers internally, so checking before calling the function is redundant. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/scsi/aic94xx/aic94xx_seq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 390168f62a1..5fdca93892a 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c @@ -1228,8 +1228,7 @@ static int asd_seq_start_lseq(struct asd_ha_struct *asd_ha, int lseq) int asd_release_firmware(void) { - if (sequencer_fw) - release_firmware(sequencer_fw); + release_firmware(sequencer_fw); return 0; } -- cgit v1.2.3-70-g09d2 From cf92549f1c95e0b1fd980828c35416dc2e548d2b Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:51:41 +0200 Subject: qla2xxx: Remove redundant NULL check before release_firmware() call. release_firmware() checks for NULL pointers internally so checking before calling it is redundant. Signed-off-by: Jesper Juhl Acked-by: Chad Dupuis Signed-off-by: Jiri Kosina --- drivers/scsi/qla2xxx/qla_os.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index a2f999273a5..91b6fe6000e 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4106,8 +4106,7 @@ qla2x00_release_firmware(void) mutex_lock(&qla_fw_lock); for (idx = 0; idx < FW_BLOBS; idx++) - if (qla_fw_blobs[idx].fw) - release_firmware(qla_fw_blobs[idx].fw); + release_firmware(qla_fw_blobs[idx].fw); mutex_unlock(&qla_fw_lock); } -- cgit v1.2.3-70-g09d2 From 3cc6e78777ae6f577b67e26c76577ef357ac9009 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:51:25 +0200 Subject: remoteproc: remove redundant NULL check before release_firmware() release_firmware deals gracefully with NULL pointers, so checking first is redundant. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/remoteproc/remoteproc_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index ee15c68fb51..3d2884b0a4f 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1105,8 +1105,7 @@ static void rproc_fw_config_virtio(const struct firmware *fw, void *context) goto out; out: - if (fw) - release_firmware(fw); + release_firmware(fw); /* allow rproc_unregister() contexts, if any, to proceed */ complete_all(&rproc->firmware_loading_complete); } -- cgit v1.2.3-70-g09d2 From 90449e5dee4800721a352af11ae4d65d4a56ba93 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 22:51:36 +0200 Subject: qla1280: Remove redundant NULL check before release_firmware() call release_firmware() checks for NULL pointers internally so checking before calling the function is redundant. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- drivers/scsi/qla1280.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 6c6486f626e..538230be5cc 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -4473,17 +4473,14 @@ qla1280_exit(void) pci_unregister_driver(&qla1280_pci_driver); /* release any allocated firmware images */ for (i = 0; i < QL_NUM_FW_IMAGES; i++) { - if (qla1280_fw_tbl[i].fw) { - release_firmware(qla1280_fw_tbl[i].fw); - qla1280_fw_tbl[i].fw = NULL; - } + release_firmware(qla1280_fw_tbl[i].fw); + qla1280_fw_tbl[i].fw = NULL; } } module_init(qla1280_init); module_exit(qla1280_exit); - MODULE_AUTHOR("Qlogic & Jes Sorensen"); MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver"); MODULE_LICENSE("GPL"); -- cgit v1.2.3-70-g09d2 From 15ed103a98008d85f20956e0e29c2cae78051efe Mon Sep 17 00:00:00 2001 From: David Mackey Date: Tue, 17 Apr 2012 11:30:52 -0700 Subject: edac: Fix spelling errors. Signed-off-by: David Mackey Signed-off-by: Vinson Lee Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- drivers/edac/edac_core.h | 6 +++--- drivers/edac/edac_device.c | 10 +++++----- drivers/edac/i7core_edac.c | 10 +++++----- drivers/edac/sb_edac.c | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'drivers') diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index e48ab3108ad..841bb2d7ce6 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -107,13 +107,13 @@ extern int edac_debug_level; * * CPU caches (L1 and L2) * DMA engines - * Core CPU swithces + * Core CPU switches * Fabric switch units * PCIe interface controllers * other EDAC/ECC type devices that can be monitored for * errors, etc. * - * It allows for a 2 level set of hiearchry. For example: + * It allows for a 2 level set of hierarchy. For example: * * cache could be composed of L1, L2 and L3 levels of cache. * Each CPU core would have its own L1 cache, while sharing @@ -460,7 +460,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, /* * The no info errors are used when error overflows are reported. * There are a limited number of error logging registers that can - * be exausted. When all registers are exhausted and an additional + * be exhausted. When all registers are exhausted and an additional * error occurs then an error overflow register records that an * error occurred and the type of error, but doesn't have any * further information. The ce/ue versions make for cleaner diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 4b154593343..da4a1f11939 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -56,7 +56,7 @@ static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev) * * The control structure is allocated in complete chunk * from the OS. It is in turn sub allocated to the - * various objects that compose the struture + * various objects that compose the structure * * The structure has a 'nr_instance' array within itself. * Each instance represents a major component @@ -118,7 +118,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info( /* Calc the 'end' offset past the attributes array */ pvt = edac_align_ptr(&dev_attrib[count], sz_private); } else { - /* no attribute array specificed */ + /* no attribute array specified */ pvt = edac_align_ptr(dev_attrib, sz_private); } @@ -367,7 +367,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info * structure, that needs to be polled for possible error events. * * This operation is to acquire the list mutex lock - * (thus preventing insertation or deletion) + * (thus preventing insertion or deletion) * and then call the device's poll function IFF this device is * running polled and there is a poll function defined. */ @@ -394,7 +394,7 @@ static void edac_device_workq_function(struct work_struct *work_req) /* Reschedule the workq for the next time period to start again * if the number of msec is for 1 sec, then adjust to the next - * whole one second to save timers fireing all over the period + * whole one second to save timers firing all over the period * between integral seconds */ if (edac_dev->poll_msec == 1000) @@ -563,7 +563,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device); * Remove sysfs entries for specified edac_device structure and * then remove edac_device structure from global list * - * @pdev: + * @dev: * Pointer to 'struct device' representing edac_device * structure to remove. * diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 85226ccf529..7f1dfcc4e59 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -90,7 +90,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); #define MC_MAX_DOD 0x64 /* - * OFFSETS for Device 3 Function 4, as inicated on Xeon 5500 datasheet: + * OFFSETS for Device 3 Function 4, as indicated on Xeon 5500 datasheet: * http://www.arrownac.com/manufacturers/intel/s/nehalem/5500-datasheet-v2.pdf */ @@ -101,7 +101,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); #define DIMM1_COR_ERR(r) (((r) >> 16) & 0x7fff) #define DIMM0_COR_ERR(r) ((r) & 0x7fff) -/* OFFSETS for Device 3 Function 2, as inicated on Xeon 5500 datasheet */ +/* OFFSETS for Device 3 Function 2, as indicated on Xeon 5500 datasheet */ #define MC_SSRCONTROL 0x48 #define SSR_MODE_DISABLE 0x00 #define SSR_MODE_ENABLE 0x01 @@ -398,7 +398,7 @@ static DEFINE_PCI_DEVICE_TABLE(i7core_pci_tbl) = { }; /**************************************************************************** - Anciliary status routines + Ancillary status routines ****************************************************************************/ /* MC_CONTROL bits */ @@ -1361,7 +1361,7 @@ static int i7core_get_onedevice(struct pci_dev **prev, dev_descr->dev_id, *prev); /* - * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core regs + * On Xeon 55xx, the Intel QuickPath Arch Generic Non-core regs * is at addr 8086:2c40, instead of 8086:2c41. So, we need * to probe for the alternate address in case of failure */ @@ -2132,7 +2132,7 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw) /* * get_sdram_scrub_rate This routine convert current scrub rate value - * into byte/sec bandwidth accourding to + * into byte/sec bandwidth according to * SCRUBINTERVAL formula found in datasheet. */ static int get_sdram_scrub_rate(struct mem_ctl_info *mci) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index a203536d90d..123204f8e23 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -58,7 +58,7 @@ static int probed; /* * FIXME: For now, let's order by device function, as it makes - * easier for driver's development proccess. This table should be + * easier for driver's development process. This table should be * moved to pci_id.h when submitted upstream */ #define PCI_DEVICE_ID_INTEL_SBRIDGE_SAD0 0x3cf4 /* 12.6 */ @@ -375,7 +375,7 @@ static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = { /**************************************************************************** - Anciliary status routines + Ancillary status routines ****************************************************************************/ static inline int numrank(u32 mtr) @@ -1430,7 +1430,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, type = "FATAL"; /* - * According with Table 15-9 of the Intel Archictecture spec vol 3A, + * According with Table 15-9 of the Intel Architecture spec vol 3A, * memory errors should fit in this mask: * 000f 0000 1mmm cccc (binary) * where: -- cgit v1.2.3-70-g09d2 From e1d206018831c789cf4445e8f641b3c0df90b2bb Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 7 May 2012 11:00:37 +0200 Subject: c2port: fix bogus Kconfig "default no" Strictly speaking "no" is a valid, but undefined, Kconfig symbol. But what obviously was meant here was "n". While we're touching this Kconfig file also drop the superfluous dependency on C2PORT for C2PORT_DURAMAR_2150. Its Kconfig entry is already wrapped in "if C2PORT" and "endif". Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/misc/c2port/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/misc/c2port/Kconfig b/drivers/misc/c2port/Kconfig index e46af9a5810..33ee834e1b8 100644 --- a/drivers/misc/c2port/Kconfig +++ b/drivers/misc/c2port/Kconfig @@ -5,7 +5,7 @@ menuconfig C2PORT tristate "Silicon Labs C2 port support (EXPERIMENTAL)" depends on EXPERIMENTAL - default no + default n help This option enables support for Silicon Labs C2 port used to program Silicon micro controller chips (and other 8051 compatible). @@ -23,8 +23,8 @@ if C2PORT config C2PORT_DURAMAR_2150 tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" - depends on X86 && C2PORT - default no + depends on X86 + default n help This option enables C2 support for the Eurotech's Duramar 2150 on board micro controller. -- cgit v1.2.3-70-g09d2 From d132d7f6fbb9cc246dab828fc9740e5caf78aeb3 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 7 May 2012 11:14:59 +0200 Subject: Kconfig: replace "--- help ---" with "---help---" There are three Kconfig entries with "--- help ---" attributes, and over 2000 Kconfig entries with "---help---" attributes. Apparently the three attributes with embedded spaces are valid. Still, I see little reason for using this obscure variant. And replacing those three attributes with the common variant makes grepping Kconfig files for help texts a bit easier too. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/usb/host/Kconfig | 2 +- drivers/w1/Kconfig | 2 +- net/caif/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index f788eb86707..e96c4b91644 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -152,7 +152,7 @@ config USB_EHCI_HCD_OMAP bool "EHCI support for OMAP3 and later chips" depends on USB_EHCI_HCD && ARCH_OMAP default y - --- help --- + ---help--- Enables support for the on-chip EHCI controller on OMAP3 and later chips. diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index fd2c7bd9dfb..6743bde038c 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig @@ -16,7 +16,7 @@ config W1_CON depends on CONNECTOR bool "Userspace communication over connector" default y - --- help --- + ---help--- This allows to communicate with userspace using connector. For more information see . There are three types of messages between w1 core and userspace: diff --git a/net/caif/Kconfig b/net/caif/Kconfig index 936361e5a2b..d3694953b1d 100644 --- a/net/caif/Kconfig +++ b/net/caif/Kconfig @@ -25,7 +25,7 @@ config CAIF_DEBUG bool "Enable Debug" depends on CAIF default n - --- help --- + ---help--- Enable the inclusion of debug code in the CAIF stack. Be aware that doing this will impact performance. If unsure say N. -- cgit v1.2.3-70-g09d2 From 8533848809c761035196723391e665e7247c670f Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:17 +0000 Subject: i2c: Change mail address of Oskar Schirmer That old mail address doesnt exist any more. This changes all occurences to my new address. Signed-off-by: Oskar Schirmer Cc: Jean Delvare Signed-off-by: Jiri Kosina --- drivers/i2c/busses/i2c-s6000.c | 2 +- drivers/i2c/busses/i2c-s6000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c index c64ba736f48..b76a29d1f8e 100644 --- a/drivers/i2c/busses/i2c-s6000.c +++ b/drivers/i2c/busses/i2c-s6000.c @@ -3,7 +3,7 @@ * * Description: Driver for S6000 Family I2C Interface * Copyright (c) 2008 emlix GmbH - * Author: Oskar Schirmer + * Author: Oskar Schirmer * * Partially based on i2c-bfin-twi.c driver by * Copyright (c) 2005-2007 Analog Devices, Inc. diff --git a/drivers/i2c/busses/i2c-s6000.h b/drivers/i2c/busses/i2c-s6000.h index ff23b81ded4..4936f9f2256 100644 --- a/drivers/i2c/busses/i2c-s6000.h +++ b/drivers/i2c/busses/i2c-s6000.h @@ -6,7 +6,7 @@ * for more details. * * Copyright (C) 2008 Emlix GmbH - * Author: Oskar Schirmer + * Author: Oskar Schirmer */ #ifndef __DRIVERS_I2C_BUSSES_I2C_S6000_H -- cgit v1.2.3-70-g09d2 From 3d4f5eb1264a1d3aa4aa19502d8c588b3cc4ecc4 Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Wed, 16 May 2012 09:41:18 +0000 Subject: net: Change mail address of Oskar Schirmer That old mail address doesnt exist any more. This changes all occurences to my new address. Signed-off-by: Oskar Schirmer Cc: netdev@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/net/ethernet/s6gmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c index 1895605abb3..6f0d28429e3 100644 --- a/drivers/net/ethernet/s6gmac.c +++ b/drivers/net/ethernet/s6gmac.c @@ -1,7 +1,7 @@ /* * Ethernet driver for S6105 on chip network device * (c)2008 emlix GmbH http://www.emlix.com - * Authors: Oskar Schirmer + * Authors: Oskar Schirmer * Daniel Gloeckner * * This program is free software; you can redistribute it and/or @@ -1070,4 +1070,4 @@ module_exit(s6gmac_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("S6105 on chip Ethernet driver"); -MODULE_AUTHOR("Oskar Schirmer "); +MODULE_AUTHOR("Oskar Schirmer "); -- cgit v1.2.3-70-g09d2 From f70d4a95edc7da87f39cd8b603ba131df2c198ed Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 22 May 2012 10:56:21 +0200 Subject: edac, mips: don't change code that has been removed in edac/mips tree This is a partial revert of 15ed103a9800 ("edac: Fix spelling errors") 6997991ab0db ("mips: Fix printk typos in arc/mips") which change code that doesn't exist any more in edac/mips trees. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina --- arch/mips/pci/pci-lantiq.c | 2 +- drivers/edac/edac_core.h | 2 +- drivers/edac/edac_device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index 70fdf2c7919..030c77e7926 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -297,7 +297,7 @@ int __init pcibios_init(void) { int ret = platform_driver_register(<q_pci_driver); if (ret) - printk(KERN_INFO "ltq_pci: Error registering platform driver!"); + printk(KERN_INFO "ltq_pci: Error registering platfom driver!"); return ret; } diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h index 841bb2d7ce6..5b739411d62 100644 --- a/drivers/edac/edac_core.h +++ b/drivers/edac/edac_core.h @@ -460,7 +460,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, /* * The no info errors are used when error overflows are reported. * There are a limited number of error logging registers that can - * be exhausted. When all registers are exhausted and an additional + * be exausted. When all registers are exhausted and an additional * error occurs then an error overflow register records that an * error occurred and the type of error, but doesn't have any * further information. The ce/ue versions make for cleaner diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index da4a1f11939..45b8f4bdd77 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c @@ -367,7 +367,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info * structure, that needs to be polled for possible error events. * * This operation is to acquire the list mutex lock - * (thus preventing insertion or deletion) + * (thus preventing insertation or deletion) * and then call the device's poll function IFF this device is * running polled and there is a poll function defined. */ -- cgit v1.2.3-70-g09d2