aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/acpica/utobject.c2
-rw-r--r--drivers/media/i2c/adv7183.c2
-rw-r--r--drivers/media/i2c/s5c73m3/s5c73m3-core.c2
-rw-r--r--drivers/mtd/nand/docg4.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/fw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c2
-rw-r--r--drivers/net/wireless/ath/ath10k/pci.c2
-rw-r--r--drivers/regulator/tps65910-regulator.c2
-rw-r--r--drivers/scsi/mvsas/mv_sas.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index aa61f66ee861..2ae2b46d9b26 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -356,7 +356,7 @@ u8 acpi_ut_valid_internal_object(void *object)
356 default: 356 default:
357 357
358 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 358 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
359 "%p is not not an ACPI operand obj [%s]\n", 359 "%p is not an ACPI operand obj [%s]\n",
360 object, acpi_ut_get_descriptor_name(object))); 360 object, acpi_ut_get_descriptor_name(object)));
361 break; 361 break;
362 } 362 }
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index 6f738d8e3a8f..d45e0e3a781d 100644
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -178,7 +178,7 @@ static int adv7183_log_status(struct v4l2_subdev *sd)
178 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_1), 178 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_1),
179 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_2), 179 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_2),
180 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_3)); 180 adv7183_read(sd, ADV7183_VS_FIELD_CTRL_3));
181 v4l2_info(sd, "adv7183: Hsync positon control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n", 181 v4l2_info(sd, "adv7183: Hsync position control 1 2 and 3 = 0x%02x 0x%02x 0x%02x\n",
182 adv7183_read(sd, ADV7183_HS_POS_CTRL_1), 182 adv7183_read(sd, ADV7183_HS_POS_CTRL_1),
183 adv7183_read(sd, ADV7183_HS_POS_CTRL_2), 183 adv7183_read(sd, ADV7183_HS_POS_CTRL_2),
184 adv7183_read(sd, ADV7183_HS_POS_CTRL_3)); 184 adv7183_read(sd, ADV7183_HS_POS_CTRL_3));
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index b76ec0e7e685..31f40b342049 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -1651,7 +1651,7 @@ static int s5c73m3_probe(struct i2c_client *client,
1651 if (ret < 0) 1651 if (ret < 0)
1652 goto out_err; 1652 goto out_err;
1653 1653
1654 v4l2_info(sd, "%s: completed succesfully\n", __func__); 1654 v4l2_info(sd, "%s: completed successfully\n", __func__);
1655 return 0; 1655 return 0;
1656 1656
1657out_err: 1657out_err:
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index fa25e7a08134..a10491af52aa 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -494,7 +494,7 @@ static uint8_t docg4_read_byte(struct mtd_info *mtd)
494 return status; 494 return status;
495 } 495 }
496 496
497 dev_warn(doc->dev, "unexpectd call to read_byte()\n"); 497 dev_warn(doc->dev, "unexpected call to read_byte()\n");
498 498
499 return 0; 499 return 0;
500} 500}
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 0d63daa2f422..8a750ca326d0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -1739,7 +1739,7 @@ void mlx4_opreq_action(struct work_struct *work)
1739 MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A, 1739 MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A,
1740 MLX4_CMD_NATIVE); 1740 MLX4_CMD_NATIVE);
1741 if (err) { 1741 if (err) {
1742 mlx4_err(dev, "Failed to retreive required operation: %d\n", 1742 mlx4_err(dev, "Failed to retrieve required operation: %d\n",
1743 err); 1743 err);
1744 return; 1744 return;
1745 } 1745 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 3ca00e05f23d..e8c56af97dfe 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1722,7 +1722,7 @@ static void qlcnic_extend_lb_idc_cmpltn_wait(struct qlcnic_adapter *adapter,
1722 struct qlcnic_hardware_context *ahw = adapter->ahw; 1722 struct qlcnic_hardware_context *ahw = adapter->ahw;
1723 int temp; 1723 int temp;
1724 1724
1725 netdev_info(adapter->netdev, "Recieved loopback IDC time extend event for 0x%x seconds\n", 1725 netdev_info(adapter->netdev, "Received loopback IDC time extend event for 0x%x seconds\n",
1726 ahw->extend_lb_time); 1726 ahw->extend_lb_time);
1727 temp = ahw->extend_lb_time * 1000; 1727 temp = ahw->extend_lb_time * 1000;
1728 *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT; 1728 *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT;
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index e2f9ef50b1bd..d510bffa0a6a 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2306,7 +2306,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
2306 break; 2306 break;
2307 default: 2307 default:
2308 ret = -ENODEV; 2308 ret = -ENODEV;
2309 ath10k_err("Unkown device ID: %d\n", pci_dev->device); 2309 ath10k_err("Unknown device ID: %d\n", pci_dev->device);
2310 goto err_ar_pci; 2310 goto err_ar_pci;
2311 } 2311 }
2312 2312
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 45c16447744b..035eb750e28c 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -906,7 +906,7 @@ static int tps65910_set_ext_sleep_config(struct tps65910_reg *pmic,
906 } 906 }
907 ret = tps65910_reg_write(pmic->mfd, sr_reg_add, 0); 907 ret = tps65910_reg_write(pmic->mfd, sr_reg_add, 0);
908 if (ret < 0) { 908 if (ret < 0) {
909 dev_err(mfd->dev, "Error in settting sr register\n"); 909 dev_err(mfd->dev, "Error in setting sr register\n");
910 return ret; 910 return ret;
911 } 911 }
912 } 912 }
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 6b1b4e91e53f..6c1f223a8e1d 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1411,7 +1411,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
1411 1411
1412 if (res) { 1412 if (res) {
1413 del_timer(&task->slow_task->timer); 1413 del_timer(&task->slow_task->timer);
1414 mv_printk("executing internel task failed:%d\n", res); 1414 mv_printk("executing internal task failed:%d\n", res);
1415 goto ex_err; 1415 goto ex_err;
1416 } 1416 }
1417 1417