From 806b2139db236e0cbd0b5833ab0ce139f0196bcd Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 15 Mar 2013 12:59:30 +0100 Subject: sfc: Fix Kconfig typo "----help---" Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/net/ethernet/sfc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 435b4f1e348..4136ccc4a95 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -24,7 +24,7 @@ config SFC_MCDI_MON bool "Solarflare SFC9000-family hwmon support" depends on SFC && HWMON && !(SFC=y && HWMON=m) default y - ----help--- + ---help--- This exposes the on-board firmware-managed sensors as a hardware monitor device. config SFC_SRIOV -- cgit v1.2.3 From a53640c3f2d11a15d7834844d06554a6b1d2dce3 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:10:40 +0800 Subject: driver: hv: remove cast for kmalloc return value remove cast for kmalloc return value. Signed-off-by: Zhang Yanfei Cc: "K. Y. Srinivasan" Cc: Haiyang Zhang Cc: Andrew Morton Cc: devel@linuxdriverproject.org Signed-off-by: Jiri Kosina --- drivers/hv/hv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 731158910c1..ae4923756d9 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -289,9 +289,8 @@ void hv_synic_init(void *arg) /* Check the version */ rdmsrl(HV_X64_MSR_SVERSION, version); - hv_context.event_dpc[cpu] = (struct tasklet_struct *) - kmalloc(sizeof(struct tasklet_struct), - GFP_ATOMIC); + hv_context.event_dpc[cpu] = kmalloc(sizeof(struct tasklet_struct), + GFP_ATOMIC); if (hv_context.event_dpc[cpu] == NULL) { pr_err("Unable to allocate event dpc\n"); goto cleanup; -- cgit v1.2.3 From eb2c560f9f2b126e1d0ebcd35709c5b37c28c817 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:29:32 +0800 Subject: driver: tty: vt: remove cast for kmalloc return value remove cast for kmalloc return value. Signed-off-by: Zhang Yanfei Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Andrew Morton Signed-off-by: Jiri Kosina --- drivers/tty/vt/consolemap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index 248381b3072..2978ca596a7 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -194,8 +194,7 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedir *p, int q = p->inverse_translations[i]; if (!q) { - q = p->inverse_translations[i] = (unsigned char *) - kmalloc(MAX_GLYPH, GFP_KERNEL); + q = p->inverse_translations[i] = kmalloc(MAX_GLYPH, GFP_KERNEL); if (!q) return; } memset(q, 0, MAX_GLYPH); -- cgit v1.2.3 From c03117574726750ea01508b7b89fe058eabe2251 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:07:37 +0800 Subject: driver: gpu: drm: i915: remove cast for kzalloc return value remove cast for kzalloc return value. Signed-off-by: Zhang Yanfei Cc: Andrew Morton Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Jiri Kosina --- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index d07a8cdf998..78413ec623c 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -451,7 +451,7 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd, int i, ret = true; /* Would be simpler to allocate both in one go ? */ - buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL); + buf = kzalloc(args_len * 2 + 2, GFP_KERNEL); if (!buf) return false; -- cgit v1.2.3 From 99c4d538854833c1be1e7449605de2f39519299e Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:27:29 +0800 Subject: driver: tty: serial: remove cast for kzalloc return value remove cast for kzalloc return value. Signed-off-by: Zhang Yanfei Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Andrew Morton Cc: linux-serial@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/tty/serial/icom.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index bc9e6b017b0..18ed5aebb16 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -1415,8 +1415,7 @@ static int icom_alloc_adapter(struct icom_adapter struct icom_adapter *cur_adapter_entry; struct list_head *tmp; - icom_adapter = (struct icom_adapter *) - kzalloc(sizeof(struct icom_adapter), GFP_KERNEL); + icom_adapter = kzalloc(sizeof(struct icom_adapter), GFP_KERNEL); if (!icom_adapter) { return -ENOMEM; -- cgit v1.2.3 From 53140e062bcabef33dddafd09132f5d62de90144 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:33:27 +0800 Subject: driver: usb: storage: remove cast for kmalloc return value remove cast for kmalloc return value. Signed-off-by: Zhang Yanfei Cc: Matthew Dharm Cc: Greg Kroah-Hartman Cc: Andrew Morton Cc: linux-usb@vger.kernel.org Cc: usb-storage@lists.one-eyed-alien.net Signed-off-by: Jiri Kosina --- drivers/usb/storage/isd200.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index ecea4787736..06a3d22db68 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c @@ -1457,8 +1457,7 @@ static int isd200_init_info(struct us_data *us) retStatus = ISD200_ERROR; else { info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL); - info->RegsBuf = (unsigned char *) - kmalloc(sizeof(info->ATARegs), GFP_KERNEL); + info->RegsBuf = kmalloc(sizeof(info->ATARegs), GFP_KERNEL); info->srb.sense_buffer = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL); if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) { -- cgit v1.2.3 From ce03cb20640b94d6124decec36db4d84ee30c83c Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Wed, 27 Feb 2013 17:16:12 +0800 Subject: drivers/isdn: delete 'break' after 'return' delete 'break' statement after 'return' statement Signed-off-by: Chen Gang Signed-off-by: Jiri Kosina --- drivers/isdn/i4l/isdn_tty.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers') diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index d8a7d832341..925a7ed4a85 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c @@ -3425,7 +3425,6 @@ isdn_tty_parse_at(modem_info *info) p++; isdn_tty_cmd_ATA(info); return; - break; case 'D': /* D - Dial */ if (info->msr & UART_MSR_DCD) -- cgit v1.2.3 From cf2fbdd26f80046725a11a80683a03baf27fae82 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 16 Mar 2013 20:53:05 +0900 Subject: treewide: Fix typos in printk and comment Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- drivers/crypto/caam/ctrl.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +- drivers/i2c/busses/i2c-puv3.c | 2 +- drivers/scsi/qla4xxx/ql4_nx.c | 2 +- drivers/usb/misc/uss720.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 1c56f63524f..8acf00490fd 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -66,7 +66,7 @@ static void build_instantiation_desc(u32 *desc) /* * load 1 to clear written reg: - * resets the done interrrupt and returns the RNG to idle. + * resets the done interrupt and returns the RNG to idle. */ append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 90374dd7796..8c8a7f0d982 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -270,7 +270,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev) } /** - * radeon_irq_kms_fini - tear down driver interrrupt info + * radeon_irq_kms_fini - tear down driver interrupt info * * @rdev: radeon device pointer * diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c index 261d7db437e..8acef657abf 100644 --- a/drivers/i2c/busses/i2c-puv3.c +++ b/drivers/i2c/busses/i2c-puv3.c @@ -199,7 +199,7 @@ static int puv3_i2c_probe(struct platform_device *pdev) adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL); if (adapter == NULL) { - dev_err(&pdev->dev, "can't allocate inteface!\n"); + dev_err(&pdev->dev, "can't allocate interface!\n"); rc = -ENOMEM; goto fail_nomem; } diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 71d3d234f52..9299400d3c9 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c @@ -2089,7 +2089,7 @@ static int qla4_8xxx_minidump_process_rdmem(struct scsi_qla_host *ha, if (r_addr & 0xf) { DEBUG2(ql4_printk(KERN_INFO, ha, - "[%s]: Read addr 0x%x not 16 bytes alligned\n", + "[%s]: Read addr 0x%x not 16 bytes aligned\n", __func__, r_addr)); return QLA_ERROR; } diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 29cad9e0a7a..e129cf66122 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c @@ -705,7 +705,7 @@ static int uss720_probe(struct usb_interface *intf, return -ENODEV; } i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2); - dev_dbg(&intf->dev, "set inteface result %d\n", i); + dev_dbg(&intf->dev, "set interface result %d\n", i); interface = intf->cur_altsetting; -- cgit v1.2.3 From 07f42258893d3768deb9a24165d23f1355bc1949 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 20 Mar 2013 11:00:34 +0900 Subject: treewide: Fix typos in printk Correct spelling typo in various drivers. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- drivers/ata/sata_fsl.c | 2 +- drivers/clk/mvebu/clk-core.c | 4 ++-- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/media/usb/dvb-usb/opera1.c | 2 +- drivers/net/ethernet/ti/cpts.c | 2 +- drivers/power/pm2301_charger.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +- drivers/video/goldfishfb.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers') diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 124b2c1d9c0..b0fd7cd40e7 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -311,7 +311,7 @@ static void fsl_sata_set_irq_coalescing(struct ata_host *host, intr_coalescing_ticks = ticks; spin_unlock(&host->lock); - DPRINTK("intrrupt coalescing, count = 0x%x, ticks = %x\n", + DPRINTK("interrupt coalescing, count = 0x%x, ticks = %x\n", intr_coalescing_count, intr_coalescing_ticks); DPRINTK("ICC register status: (hcr base: 0x%x) = 0x%x\n", hcr_base, ioread32(hcr_base + ICC)); diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c index 69056a7479e..1b4e3332ac1 100644 --- a/drivers/clk/mvebu/clk-core.c +++ b/drivers/clk/mvebu/clk-core.c @@ -157,7 +157,7 @@ static u32 __init armada_370_get_cpu_freq(void __iomem *sar) cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) & SARL_A370_PCLK_FREQ_OPT_MASK); if (cpu_freq_select > ARRAY_SIZE(armada_370_cpu_frequencies)) { - pr_err("CPU freq select unsuported %d\n", cpu_freq_select); + pr_err("CPU freq select unsupported %d\n", cpu_freq_select); cpu_freq = 0; } else cpu_freq = armada_370_cpu_frequencies[cpu_freq_select]; @@ -279,7 +279,7 @@ static u32 __init armada_xp_get_cpu_freq(void __iomem *sar) SARH_AXP_PCLK_FREQ_OPT_MASK) << SARH_AXP_PCLK_FREQ_OPT_SHIFT); if (cpu_freq_select > ARRAY_SIZE(armada_xp_cpu_frequencies)) { - pr_err("CPU freq select unsuported: %d\n", cpu_freq_select); + pr_err("CPU freq select unsupported: %d\n", cpu_freq_select); cpu_freq = 0; } else cpu_freq = armada_xp_cpu_frequencies[cpu_freq_select]; diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f61cb7998c7..6d8219e59bd 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2017,7 +2017,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) } if (channel_eq) - DRM_DEBUG_KMS("Channel EQ done. DP Training successfull\n"); + DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n"); intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_DISABLE); } diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c index c8a95042dfb..16ba90acf53 100644 --- a/drivers/media/usb/dvb-usb/opera1.c +++ b/drivers/media/usb/dvb-usb/opera1.c @@ -151,7 +151,7 @@ static int opera1_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], break; } if (dvb_usb_opera1_debug & 0x10) - info("sending i2c mesage %d %d", tmp, msg[i].len); + info("sending i2c message %d %d", tmp, msg[i].len); } mutex_unlock(&d->i2c_mutex); return num; diff --git a/drivers/net/ethernet/ti/cpts.c b/drivers/net/ethernet/ti/cpts.c index 463597f919f..8c351f100ac 100644 --- a/drivers/net/ethernet/ti/cpts.c +++ b/drivers/net/ethernet/ti/cpts.c @@ -94,7 +94,7 @@ static int cpts_fifo_read(struct cpts *cpts, int match) case CPTS_EV_HW: break; default: - pr_err("cpts: unkown event type\n"); + pr_err("cpts: unknown event type\n"); break; } if (type == match) diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index ed48d75bb78..ee346d44357 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -235,7 +235,7 @@ out: static int pm2xxx_charger_wd_exp_mngt(struct pm2xxx_charger *pm2, int val) { - dev_dbg(pm2->dev , "20 minutes watchdog occured\n"); + dev_dbg(pm2->dev , "20 minutes watchdog expired\n"); pm2->ac.wd_expired = true; power_supply_changed(&pm2->ac_chg.psy); diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c index 1df9ed4f371..4db0c7a18bd 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -148,7 +148,7 @@ _config_display_some_debug(struct MPT3SAS_ADAPTER *ioc, u16 smid, desc = "raid_config"; break; case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING: - desc = "driver_mappping"; + desc = "driver_mapping"; break; } break; diff --git a/drivers/video/goldfishfb.c b/drivers/video/goldfishfb.c index 489abb32fc0..7f6c9e6cfc6 100644 --- a/drivers/video/goldfishfb.c +++ b/drivers/video/goldfishfb.c @@ -148,7 +148,7 @@ static int goldfish_fb_pan_display(struct fb_var_screeninfo *var, wait_event_timeout(fb->wait, fb->base_update_count != base_update_count, HZ / 15); if (fb->base_update_count == base_update_count) - pr_err("goldfish_fb_pan_display: timeout wating for base update\n"); + pr_err("goldfish_fb_pan_display: timeout waiting for base update\n"); return 0; } -- cgit v1.2.3 From e6423f8be51bab31c37facd6d2086bb08dbad507 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 25 Mar 2013 10:34:46 +0100 Subject: irq: versatile: rename Kconfig macro in printk Commit 2389d5014342e9535aad212d0c68d439aaf534ba ("ARM: plat-versatile: move FPGA irq driver to drivers/irqchip") changed Kconfig symbol PLAT_VERSATILE_FPGA_IRQ_NR to VERSATILE_FPGA_IRQ_NR. It forgot to change one reference to the related macro in a printk. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/irqchip/irq-versatile-fpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index 9dbd82b716d..065b7a31a47 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c @@ -139,7 +139,7 @@ void __init fpga_irq_init(void __iomem *base, const char *name, int irq_start, int i; if (fpga_irq_id >= ARRAY_SIZE(fpga_irq_devices)) { - pr_err("%s: too few FPGA IRQ controllers, increase CONFIG_PLAT_VERSATILE_FPGA_IRQ_NR\n", __func__); + pr_err("%s: too few FPGA IRQ controllers, increase CONFIG_VERSATILE_FPGA_IRQ_NR\n", __func__); return; } f = &fpga_irq_devices[fpga_irq_id]; -- cgit v1.2.3 From 0bb9121c8882f015328084defdf8647df2fef50d Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 26 Mar 2013 09:45:38 +0100 Subject: radio-shark: Fix printk "CONFIG_LED_CLASS" Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/media/radio/radio-shark.c | 2 +- drivers/media/radio/radio-shark2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c index 8c309c7134d..8fa18ab5b72 100644 --- a/drivers/media/radio/radio-shark.c +++ b/drivers/media/radio/radio-shark.c @@ -284,7 +284,7 @@ static void shark_resume_leds(struct shark_device *shark) static int shark_register_leds(struct shark_device *shark, struct device *dev) { v4l2_warn(&shark->v4l2_dev, - "CONFIG_LED_CLASS not enabled, LED support disabled\n"); + "CONFIG_LEDS_CLASS not enabled, LED support disabled\n"); return 0; } static inline void shark_unregister_leds(struct shark_device *shark) { } diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c index ef65ebbd536..9fb669721e6 100644 --- a/drivers/media/radio/radio-shark2.c +++ b/drivers/media/radio/radio-shark2.c @@ -250,7 +250,7 @@ static void shark_resume_leds(struct shark_device *shark) static int shark_register_leds(struct shark_device *shark, struct device *dev) { v4l2_warn(&shark->v4l2_dev, - "CONFIG_LED_CLASS not enabled, LED support disabled\n"); + "CONFIG_LEDS_CLASS not enabled, LED support disabled\n"); return 0; } static inline void shark_unregister_leds(struct shark_device *shark) { } -- cgit v1.2.3 From 1051e9b33bbf550be52bdd674b519f3dc99f0dd9 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sun, 31 Mar 2013 01:23:50 +0900 Subject: treewide: Fix typos in kernel messages Correct spelling typos in various part of printk. Signed-off-by: Masanari Iida Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- drivers/scsi/lpfc/lpfc_bsg.c | 2 +- drivers/scsi/osd/osd_initiator.c | 2 +- drivers/video/exynos/exynos_dp_core.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers') diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index beb6dbacebd..98a9c093a6b 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -1312,7 +1312,7 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev) int cnt; spin_lock_irqsave(&dev->condlock, flags); - mfc_debug(2, "Previos context: %d (bits %08lx)\n", dev->curr_ctx, + mfc_debug(2, "Previous context: %d (bits %08lx)\n", dev->curr_ctx, dev->ctx_work_bits); new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS; cnt = 0; diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c index 21e261ffbe1..3ef7092e3f1 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c @@ -810,7 +810,7 @@ int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc) if (wufc & AT_WUFC_LNKC) { wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN; if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) { - dev_dbg(&pdev->dev, "%s: write phy MII_IER faild.\n", + dev_dbg(&pdev->dev, "%s: write phy MII_IER failed.\n", atl1c_driver_name); } } diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c index 32d5683e618..f5d106456f1 100644 --- a/drivers/scsi/lpfc/lpfc_bsg.c +++ b/drivers/scsi/lpfc/lpfc_bsg.c @@ -4741,7 +4741,7 @@ lpfc_bsg_mbox_cmd(struct fc_bsg_job *job) if (job->request_len < sizeof(struct fc_bsg_request) + sizeof(struct dfc_mbox_req)) { lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC, - "2737 Mix-and-match backward compability " + "2737 Mix-and-match backward compatibility " "between MBOX_REQ old size:%d and " "new request size:%d\n", (int)(job->request_len - diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index d8293f25ca3..aa66361ed44 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c @@ -1049,7 +1049,7 @@ static struct bio *_create_sg_bios(struct osd_request *or, bio = bio_kmalloc(GFP_KERNEL, numentries); if (unlikely(!bio)) { - OSD_DEBUG("Faild to allocate BIO size=%u\n", numentries); + OSD_DEBUG("Failed to allocate BIO size=%u\n", numentries); return ERR_PTR(-ENOMEM); } diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c index de9d4da0e3d..12bbede3b09 100644 --- a/drivers/video/exynos/exynos_dp_core.c +++ b/drivers/video/exynos/exynos_dp_core.c @@ -976,14 +976,14 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp) } if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) { - dev_err(dp->dev, "faild to get reg for dptx-phy\n"); + dev_err(dp->dev, "failed to get reg for dptx-phy\n"); ret = -EINVAL; goto err; } if (of_property_read_u32(dp_phy_node, "samsung,enable-mask", &dp->enable_mask)) { - dev_err(dp->dev, "faild to get enable-mask for dptx-phy\n"); + dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n"); ret = -EINVAL; goto err; } -- cgit v1.2.3 From 393b148f9d0e70cfcb0096985bb0f0742802929e Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Fri, 5 Apr 2013 01:05:05 +0900 Subject: mei: Fix comments in drivers/misc/mei Correct typos and fix stray comments. Signed-off-by: Masanari Iida Acked-by: Winkler, Tomas Signed-off-by: Jiri Kosina --- drivers/misc/mei/amthif.c | 6 +++--- drivers/misc/mei/client.c | 24 ++++++++++++------------ drivers/misc/mei/hbm.c | 9 +++++---- drivers/misc/mei/hw-me.c | 8 ++++---- drivers/misc/mei/interrupt.c | 6 +++--- drivers/misc/mei/pci-me.c | 1 + drivers/misc/mei/wd.c | 1 + 7 files changed, 29 insertions(+), 26 deletions(-) (limited to 'drivers') diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index c86d7e3839a..1fbfd63e683 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -60,7 +60,7 @@ void mei_amthif_reset_params(struct mei_device *dev) } /** - * mei_amthif_host_init_ - mei initialization amthif client. + * mei_amthif_host_init - mei initialization amthif client. * * @dev: the device structure * @@ -433,7 +433,7 @@ unsigned int mei_amthif_poll(struct mei_device *dev, /** - * mei_amthif_irq_process_completed - processes completed iamthif operation. + * mei_amthif_irq_write_completed - processes completed iamthif operation. * * @dev: the device structure. * @slots: free slots. @@ -703,7 +703,7 @@ static bool mei_clear_lists(struct mei_device *dev, struct file *file) /** * mei_amthif_release - the release function * -* @inode: pointer to inode structure +* @dev: device structure * @file: pointer to file structure * * returns 0 on success, <0 on error diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index 1569afe935d..4eba513b6be 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -109,7 +109,7 @@ void mei_io_cb_free(struct mei_cl_cb *cb) * mei_io_cb_init - allocate and initialize io callback * * @cl - mei client - * @file: pointer to file structure + * @fp: pointer to file structure * * returns mei_cl_cb pointer or NULL; */ @@ -132,8 +132,8 @@ struct mei_cl_cb *mei_io_cb_init(struct mei_cl *cl, struct file *fp) /** * mei_io_cb_alloc_req_buf - allocate request buffer * - * @cb - io callback structure - * @size: size of the buffer + * @cb: io callback structure + * @length: size of the buffer * * returns 0 on success * -EINVAL if cb is NULL @@ -154,10 +154,10 @@ int mei_io_cb_alloc_req_buf(struct mei_cl_cb *cb, size_t length) return 0; } /** - * mei_io_cb_alloc_req_buf - allocate respose buffer + * mei_io_cb_alloc_resp_buf - allocate respose buffer * - * @cb - io callback structure - * @size: size of the buffer + * @cb: io callback structure + * @length: size of the buffer * * returns 0 on success * -EINVAL if cb is NULL @@ -183,7 +183,6 @@ int mei_io_cb_alloc_resp_buf(struct mei_cl_cb *cb, size_t length) /** * mei_cl_flush_queues - flushes queue lists belonging to cl. * - * @dev: the device structure * @cl: host client */ int mei_cl_flush_queues(struct mei_cl *cl) @@ -243,7 +242,8 @@ struct mei_cl *mei_cl_allocate(struct mei_device *dev) /** * mei_cl_find_read_cb - find this cl's callback in the read list * - * @dev: device structure + * @cl: host client + * * returns cb on success, NULL on error */ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) @@ -262,6 +262,7 @@ struct mei_cl_cb *mei_cl_find_read_cb(struct mei_cl *cl) * * @cl - host client * @id - fixed host id or -1 for genereting one + * * returns 0 on success * -EINVAL on incorrect values * -ENONET if client not found @@ -301,7 +302,7 @@ int mei_cl_link(struct mei_cl *cl, int id) /** * mei_cl_unlink - remove me_cl from the list * - * @dev: the device structure + * @cl: host client */ int mei_cl_unlink(struct mei_cl *cl) { @@ -534,7 +535,6 @@ out: /** * mei_cl_flow_ctrl_creds - checks flow_control credits for cl. * - * @dev: the device structure * @cl: private data of the file object * * returns 1 if mei_flow_ctrl_creds >0, 0 - otherwise. @@ -575,8 +575,8 @@ int mei_cl_flow_ctrl_creds(struct mei_cl *cl) /** * mei_cl_flow_ctrl_reduce - reduces flow_control. * - * @dev: the device structure * @cl: private data of the file object + * * @returns * 0 on success * -ENOENT when me client is not found @@ -614,7 +614,7 @@ int mei_cl_flow_ctrl_reduce(struct mei_cl *cl) } /** - * mei_cl_start_read - the start read client message function. + * mei_cl_read_start - the start read client message function. * * @cl: host client * diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c index fb9e63ba3bb..4465d3f1006 100644 --- a/drivers/misc/mei/hbm.c +++ b/drivers/misc/mei/hbm.c @@ -62,6 +62,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev) /** * mei_hbm_cl_hdr - construct client hbm header + * * @cl: - client * @hbm_cmd: host bus message command * @buf: buffer for cl header @@ -184,7 +185,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev) } /** - * mei_hbm_prop_requsest - request property for a single client + * mei_hbm_prop_req - request property for a single client * * @dev: the device structure * @@ -283,9 +284,9 @@ int mei_hbm_cl_flow_control_req(struct mei_device *dev, struct mei_cl *cl) } /** - * add_single_flow_creds - adds single buffer credentials. + * mei_hbm_add_single_flow_creds - adds single buffer credentials. * - * @file: private data ot the file object. + * @dev: the device structure * @flow: flow control. */ static void mei_hbm_add_single_flow_creds(struct mei_device *dev, @@ -477,7 +478,7 @@ static void mei_hbm_cl_connect_res(struct mei_device *dev, /** - * mei_client_disconnect_request - disconnect request initiated by me + * mei_hbm_fw_disconnect_req - disconnect request initiated by me * host sends disoconnect response * * @dev: the device structure. diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 45ea7185c00..c31f7a47f5b 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -103,7 +103,7 @@ static inline void mei_hcsr_set(struct mei_me_hw *hw, u32 hcsr) /** - * me_hw_config - configure hw dependent settings + * mei_me_hw_config - configure hw dependent settings * * @dev: mei device */ @@ -155,7 +155,7 @@ static void mei_me_intr_disable(struct mei_device *dev) * mei_me_hw_reset - resets fw via mei csr register. * * @dev: the device structure - * @interrupts_enabled: if interrupt should be enabled after reset. + * @intr_enable: if interrupt should be enabled after reset. */ static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) { @@ -243,7 +243,7 @@ static unsigned char mei_hbuf_filled_slots(struct mei_device *dev) } /** - * mei_hbuf_is_empty - checks if host buffer is empty. + * mei_me_hbuf_is_empty - checks if host buffer is empty. * * @dev: the device structure * @@ -543,7 +543,7 @@ static const struct mei_hw_ops mei_me_hw_ops = { }; /** - * init_mei_device - allocates and initializes the mei device structure + * mei_me_dev_init - allocates and initializes the mei device structure * * @pdev: The pci device structure * diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 3535b2676c9..8a649d78452 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -30,7 +30,7 @@ /** - * mei_complete_handler - processes completed operation. + * mei_irq_complete_handler - processes completed operation. * * @cl: private data of the file object. * @cb_pos: callback block. @@ -177,7 +177,7 @@ static int _mei_irq_thread_close(struct mei_device *dev, s32 *slots, /** - * _mei_hb_read - processes read related operation. + * _mei_irq_thread_read - processes read related operation. * * @dev: the device structure. * @slots: free slots. @@ -310,7 +310,7 @@ static int mei_irq_thread_write_complete(struct mei_device *dev, s32 *slots, } /** - * mei_irq_thread_read_handler - bottom half read routine after ISR to + * mei_irq_read_handler - bottom half read routine after ISR to * handle the read processing. * * @dev: the device structure diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index b40ec0601ab..df1750651bf 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -92,6 +92,7 @@ static DEFINE_MUTEX(mei_mutex); /** * mei_quirk_probe - probe for devices that doesn't valid ME interface + * * @pdev: PCI device structure * @ent: entry into pci_device_table * diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c index 2413247fc39..3effd5f20bf 100644 --- a/drivers/misc/mei/wd.c +++ b/drivers/misc/mei/wd.c @@ -58,6 +58,7 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout) * mei_wd_host_init - connect to the watchdog client * * @dev: the device structure + * * returns -ENENT if wd client cannot be found * -EIO if write has failed * 0 on success -- cgit v1.2.3 From a895d57da04a4a24cda996e1a72425ff7e7e6c22 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Tue, 9 Apr 2013 02:06:50 +0900 Subject: treewide: Fix typo in printks Correct spelling typos in printk and comments. Signed-off-by: Masanari Iida Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- drivers/media/pci/saa7164/saa7164-core.c | 2 +- drivers/rtc/Kconfig | 4 ++-- drivers/rtc/rtc-max8997.c | 2 +- drivers/usb/misc/iowarrior.c | 4 ++-- drivers/video/amifb.c | 2 +- drivers/video/auo_k190x.c | 2 +- drivers/video/s1d13xxxfb.c | 2 +- drivers/video/ssd1307fb.c | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers') diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c index 63502e7a2a7..7618fdae811 100644 --- a/drivers/media/pci/saa7164/saa7164-core.c +++ b/drivers/media/pci/saa7164/saa7164-core.c @@ -54,7 +54,7 @@ MODULE_PARM_DESC(debug, "enable debug messages"); unsigned int fw_debug; module_param(fw_debug, int, 0644); -MODULE_PARM_DESC(fw_debug, "Firware debug level def:2"); +MODULE_PARM_DESC(fw_debug, "Firmware debug level def:2"); unsigned int encoder_buffers = SAA7164_MAX_ENCODER_BUFFERS; module_param(encoder_buffers, int, 0644); diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 79fbe3832df..0c81915b199 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -402,7 +402,7 @@ config RTC_DRV_TPS6586X tristate "TI TPS6586X RTC driver" depends on MFD_TPS6586X help - TI Power Managment IC TPS6586X supports RTC functionality + TI Power Management IC TPS6586X supports RTC functionality along with alarm. This driver supports the RTC driver for the TPS6586X RTC module. @@ -420,7 +420,7 @@ config RTC_DRV_TPS80031 tristate "TI TPS80031/TPS80032 RTC driver" depends on MFD_TPS80031 help - TI Power Managment IC TPS80031 supports RTC functionality + TI Power Management IC TPS80031 supports RTC functionality along with alarm. This driver supports the RTC driver for the TPS80031 RTC module. diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c index 00e505b6bee..f15202c771d 100644 --- a/drivers/rtc/rtc-max8997.c +++ b/drivers/rtc/rtc-max8997.c @@ -24,7 +24,7 @@ /* Module parameter for WTSR function control */ static int wtsr_en = 1; module_param(wtsr_en, int, 0444); -MODULE_PARM_DESC(wtsr_en, "Wachdog Timeout & Sofware Reset (default=on)"); +MODULE_PARM_DESC(wtsr_en, "Watchdog Timeout & Software Reset (default=on)"); /* Module parameter for SMPL function control */ static int smpl_en = 1; module_param(smpl_en, int, 0444); diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index db46143c67a..d36f34e25be 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -672,7 +672,7 @@ static int iowarrior_release(struct inode *inode, struct file *file) retval = -ENODEV; /* close called more than once */ mutex_unlock(&dev->mutex); } else { - dev->opened = 0; /* we're closeing now */ + dev->opened = 0; /* we're closing now */ retval = 0; if (dev->present) { /* @@ -802,7 +802,7 @@ static int iowarrior_probe(struct usb_interface *interface, /* this one will match for the IOWarrior56 only */ dev->int_out_endpoint = endpoint; } - /* we have to check the report_size often, so remember it in the endianess suitable for our machine */ + /* we have to check the report_size often, so remember it in the endianness suitable for our machine */ dev->report_size = usb_endpoint_maxp(dev->int_in_endpoint); if ((dev->interface->cur_altsetting->desc.bInterfaceNumber == 0) && (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW56)) diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 7fa1bf82372..87b2bb3f83f 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -1181,7 +1181,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par, } /* - * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing + * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the following * checks failed and smooth scrolling is not possible */ diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c index 53846cb534d..47e6770fa1f 100644 --- a/drivers/video/auo_k190x.c +++ b/drivers/video/auo_k190x.c @@ -935,7 +935,7 @@ int auok190x_common_probe(struct platform_device *pdev, goto err_defio; } - dev_dbg(info->device, "targetting %d frames per second\n", board->fps); + dev_dbg(info->device, "targeting %d frames per second\n", board->fps); info->fbdefio->delay = HZ / board->fps; info->fbdefio->first_io = auok190xfb_dpy_first_io, info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io, diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 76d9053d88c..05c2dc3d4bc 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c @@ -862,7 +862,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev) printk(KERN_INFO PFX "unknown chip production id %i, revision %i\n", prod_id, revision); - printk(KERN_INFO PFX "please contant maintainer\n"); + printk(KERN_INFO PFX "please contact maintainer\n"); goto bail; } diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c index 395cb6a8d8f..9ef05d3ef68 100644 --- a/drivers/video/ssd1307fb.c +++ b/drivers/video/ssd1307fb.c @@ -1,5 +1,5 @@ /* - * Driver for the Solomon SSD1307 OLED controler + * Driver for the Solomon SSD1307 OLED controller * * Copyright 2012 Free Electrons * @@ -392,6 +392,6 @@ static struct i2c_driver ssd1307fb_driver = { module_i2c_driver(ssd1307fb_driver); -MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controler"); +MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controller"); MODULE_AUTHOR("Maxime Ripard "); MODULE_LICENSE("GPL"); -- cgit v1.2.3 From 59affa501e326992adc7470bde721e2d8b13afa7 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Tue, 9 Apr 2013 15:05:40 +0800 Subject: pata_pdc2027x: Fix compiler warning Fix the follwing warnings: linux/drivers/ata/pata_pdc2027x.c:66: warning: 'pdc2027x_reinit_one' declared 'static' but never defined pdc2027x_reinit_one are defined only when CONFIG_PM is defined, thus making it conditional. Signed-off-by: Wang YanQing Signed-off-by: Jiri Kosina --- drivers/ata/pata_pdc2027x.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers') diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index 3f94a886bb3..c76e65927b0 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c @@ -63,7 +63,9 @@ enum { }; static int pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); +#ifdef CONFIG_PM static int pdc2027x_reinit_one(struct pci_dev *pdev); +#endif static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline); static void pdc2027x_set_piomode(struct ata_port *ap, struct ata_device *adev); static void pdc2027x_set_dmamode(struct ata_port *ap, struct ata_device *adev); -- cgit v1.2.3 From b23f7a09f93516f90c8e51d3e2d822f67d809d8b Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Thu, 18 Apr 2013 00:12:55 +0900 Subject: treewide: Fix typo in printk and comments Fix typo in printk and comments within various drivers. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 ++-- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/scsi/be2iscsi/be_iscsi.c | 2 +- drivers/scsi/be2iscsi/be_mgmt.c | 2 +- drivers/scsi/bnx2i/bnx2i.h | 12 ++++++------ drivers/scsi/csiostor/csio_mb.c | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'drivers') diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c index 568205436a1..c633402cbd2 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c @@ -591,7 +591,7 @@ static int bnx2x_dcbx_read_shmem_remote_mib(struct bnx2x *bp) DCBX_READ_REMOTE_MIB); if (rc) { - BNX2X_ERR("Faild to read remote mib from FW\n"); + BNX2X_ERR("Failed to read remote mib from FW\n"); return rc; } @@ -619,7 +619,7 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp) DCBX_READ_LOCAL_MIB); if (rc) { - BNX2X_ERR("Faild to read local mib from FW\n"); + BNX2X_ERR("Failed to read local mib from FW\n"); return rc; } diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 29387df4bfc..ecbceaf6882 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -59,7 +59,7 @@ static const char *rproc_crash_to_string(enum rproc_crash_type type) { if (type < ARRAY_SIZE(rproc_crash_names)) return rproc_crash_names[type]; - return "unkown"; + return "unknown"; } /* diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c index 214d691adb5..9014690fe84 100644 --- a/drivers/scsi/be2iscsi/be_iscsi.c +++ b/drivers/scsi/be2iscsi/be_iscsi.c @@ -369,7 +369,7 @@ beiscsi_set_vlan_tag(struct Scsi_Host *shost, break; default: beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG, - "BS_%d : Unkown Param Type : %d\n", + "BS_%d : Unknown Param Type : %d\n", iface_param->param); return -ENOSYS; } diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c index a6c2fe4b4d6..55cc9902263 100644 --- a/drivers/scsi/be2iscsi/be_mgmt.c +++ b/drivers/scsi/be2iscsi/be_mgmt.c @@ -1292,7 +1292,7 @@ beiscsi_adap_family_disp(struct device *dev, struct device_attribute *attr, break; default: return snprintf(buf, PAGE_SIZE, - "Unkown Adapter Family: 0x%x\n", dev_id); + "Unknown Adapter Family: 0x%x\n", dev_id); break; } } diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index b44d04e41b0..f109e3b073c 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h @@ -580,8 +580,8 @@ struct bnx2i_5771x_dbell { * @sq_mem_size: SQ size * @sq_prod_qe: SQ producer entry pointer * @sq_cons_qe: SQ consumer entry pointer - * @sq_first_qe: virtaul address of first entry in SQ - * @sq_last_qe: virtaul address of last entry in SQ + * @sq_first_qe: virtual address of first entry in SQ + * @sq_last_qe: virtual address of last entry in SQ * @sq_prod_idx: SQ producer index * @sq_cons_idx: SQ consumer index * @sqe_left: number sq entry left @@ -593,8 +593,8 @@ struct bnx2i_5771x_dbell { * @cq_mem_size: CQ size * @cq_prod_qe: CQ producer entry pointer * @cq_cons_qe: CQ consumer entry pointer - * @cq_first_qe: virtaul address of first entry in CQ - * @cq_last_qe: virtaul address of last entry in CQ + * @cq_first_qe: virtual address of first entry in CQ + * @cq_last_qe: virtual address of last entry in CQ * @cq_prod_idx: CQ producer index * @cq_cons_idx: CQ consumer index * @cqe_left: number cq entry left @@ -608,8 +608,8 @@ struct bnx2i_5771x_dbell { * @rq_mem_size: RQ size * @rq_prod_qe: RQ producer entry pointer * @rq_cons_qe: RQ consumer entry pointer - * @rq_first_qe: virtaul address of first entry in RQ - * @rq_last_qe: virtaul address of last entry in RQ + * @rq_first_qe: virtual address of first entry in RQ + * @rq_last_qe: virtual address of last entry in RQ * @rq_prod_idx: RQ producer index * @rq_cons_idx: RQ consumer index * @rqe_left: number rq entry left diff --git a/drivers/scsi/csiostor/csio_mb.c b/drivers/scsi/csiostor/csio_mb.c index 5b27c48f683..f5d9ee1fda6 100644 --- a/drivers/scsi/csiostor/csio_mb.c +++ b/drivers/scsi/csiostor/csio_mb.c @@ -182,7 +182,7 @@ csio_mb_reset(struct csio_hw *hw, struct csio_mb *mbp, uint32_t tmo, * @tmo: Command timeout. * @pf: PF number. * @vf: VF number. - * @nparams: Number of paramters + * @nparams: Number of parameters * @params: Parameter mnemonic array. * @val: Parameter value array. * @wr: Write/Read PARAMS. @@ -721,7 +721,7 @@ csio_mb_iq_free(struct csio_hw *hw, struct csio_mb *mbp, void *priv, * @mbp: Mailbox structure to initialize * @priv: Private data * @mb_tmo: Mailbox time-out period (in ms). - * @eq_ofld_params: (Offload) Egress queue paramters. + * @eq_ofld_params: (Offload) Egress queue parameters. * @cbfn: The call-back function * * @@ -752,7 +752,7 @@ csio_mb_eq_ofld_alloc(struct csio_hw *hw, struct csio_mb *mbp, void *priv, * @priv: Private data * @mb_tmo: Mailbox time-out period (in ms). * @cascaded_req: TRUE - if this request is cascased with Eq-alloc request. - * @eq_ofld_params: (Offload) Egress queue paramters. + * @eq_ofld_params: (Offload) Egress queue parameters. * @cbfn: The call-back function * * @@ -817,7 +817,7 @@ csio_mb_eq_ofld_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv, * @mbp: Mailbox structure to initialize * @priv: Private data. * @mb_tmo: Mailbox time-out period (in ms). - * @eq_ofld_params: (Offload) Egress queue paramters. + * @eq_ofld_params: (Offload) Egress queue parameters. * @cbfn: The call-back function * * @@ -840,7 +840,7 @@ csio_mb_eq_ofld_alloc_write(struct csio_hw *hw, struct csio_mb *mbp, * @hw: The HW structure. * @mbp: Mailbox structure to initialize. * @retval: Firmware return value. - * @eq_ofld_params: (Offload) Egress queue paramters. + * @eq_ofld_params: (Offload) Egress queue parameters. * */ void @@ -870,7 +870,7 @@ csio_mb_eq_ofld_alloc_write_rsp(struct csio_hw *hw, * @mbp: Mailbox structure to initialize * @priv: Private data area. * @mb_tmo: Mailbox time-out period (in ms). - * @eq_ofld_params: (Offload) Egress queue paramters, that is to be freed. + * @eq_ofld_params: (Offload) Egress queue parameters, that is to be freed. * @cbfn: The call-back function * * -- cgit v1.2.3