From patchwork Tue Mar 17 10:18:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 11442439 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DAC11668 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E95C20736 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726399AbgCQKSS (ORCPT ); Tue, 17 Mar 2020 06:18:18 -0400 Received: from mga07.intel.com ([134.134.136.100]:4738 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726416AbgCQKSR (ORCPT ); Tue, 17 Mar 2020 06:18:17 -0400 IronPort-SDR: L+KRsNYXHdLsxEmkgNMZvdPiAxvpGl/y3ZEm/UpvInMsWjSqA9gNTBwLQ9EDo0QgOP1Uf2ZqNs 1m/3xIdleXGg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:18:17 -0700 IronPort-SDR: 2ed2QYFpxtb02Y6MOCgeXCKTXBu9aeFlmsea+gJ4UdQZhZ4wyR14ZiHTs/79QdOzwbPtm4jxvi inFNwLLLC0cg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="233453315" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 17 Mar 2020 03:18:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 30610178; Tue, 17 Mar 2020 12:18:13 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: Andy Shevchenko , Linus Walleij Subject: [PATCH v1 1/5] iio: pressure: bmp280: Tolerate IRQ before registering Date: Tue, 17 Mar 2020 12:18:09 +0200 Message-Id: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org With DEBUG_SHIRQ enabled we have a kernel crash [ 116.482696] BUG: kernel NULL pointer dereference, address: 0000000000000000 ... [ 116.606571] Call Trace: [ 116.609023] [ 116.611047] complete+0x34/0x50 [ 116.614206] bmp085_eoc_irq+0x9/0x10 [bmp280] because DEBUG_SHIRQ mechanism fires an IRQ before registration and drivers ought to be able to handle an interrupt happening before request_irq() returns. Fixes: aae953949651 ("iio: pressure: bmp280: add support for BMP085 EOC interrupt") Cc: Linus Walleij Signed-off-by: Andy Shevchenko --- drivers/iio/pressure/bmp280-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 29c209cc1108..5e229b95308e 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -712,8 +712,7 @@ static int bmp180_measure(struct bmp280_data *data, u8 ctrl_meas) unsigned int delay_us; unsigned int ctrl; - if (data->use_eoc) - init_completion(&data->done); + reinit_completion(&data->done); ret = regmap_write(data->regmap, BMP280_REG_CTRL_MEAS, ctrl_meas); if (ret) @@ -969,6 +968,9 @@ static int bmp085_fetch_eoc_irq(struct device *dev, "trying to enforce it\n"); irq_trig = IRQF_TRIGGER_RISING; } + + init_completion(&data->done); + ret = devm_request_threaded_irq(dev, irq, bmp085_eoc_irq, From patchwork Tue Mar 17 10:18:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 11442443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A2611890 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6444120767 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726345AbgCQKSS (ORCPT ); Tue, 17 Mar 2020 06:18:18 -0400 Received: from mga04.intel.com ([192.55.52.120]:56031 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbgCQKSR (ORCPT ); Tue, 17 Mar 2020 06:18:17 -0400 IronPort-SDR: 8TCz4BEIZMVu9zfrh7E5Y/+YI38DwXU9Do6tbU0MNuUpQBExtG25ilE8QKDvl60nPIYLrMIORl WGzVpXqwABJw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:18:17 -0700 IronPort-SDR: iGA+AU52bFjNzZi0cH7RK62xXGF0vEBoo6o/abuGFgpStg986lOix6a3OadsRJXiYrcGI7LgUy hDyDpNyZ4hdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="323785167" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 17 Mar 2020 03:18:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3F62578; Tue, 17 Mar 2020 12:18:14 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: Andy Shevchenko Subject: [PATCH v1 2/5] iio: pressure: bmp280: Use IIO_DEVICE_ATTR_RO macro Date: Tue, 17 Mar 2020 12:18:10 +0200 Message-Id: <20200317101813.30829-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> References: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Use the IIO_DEVICE_ATTR_RO macro to create the device attributes. Signed-off-by: Andy Shevchenko --- drivers/iio/pressure/bmp280-core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 5e229b95308e..25be3ff1a6ab 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -588,7 +588,7 @@ static ssize_t bmp280_show_avail(char *buf, const int *vals, const int n) return len; } -static ssize_t bmp280_show_temp_oversampling_avail(struct device *dev, +static ssize_t in_temp_oversampling_ratio_available_show(struct device *dev, struct device_attribute *attr, char *buf) { struct bmp280_data *data = iio_priv(dev_to_iio_dev(dev)); @@ -596,8 +596,9 @@ static ssize_t bmp280_show_temp_oversampling_avail(struct device *dev, return bmp280_show_avail(buf, data->chip_info->oversampling_temp_avail, data->chip_info->num_oversampling_temp_avail); } +static IIO_DEVICE_ATTR_RO(in_temp_oversampling_ratio_available, 0); -static ssize_t bmp280_show_press_oversampling_avail(struct device *dev, +static ssize_t in_pressure_oversampling_ratio_available_show(struct device *dev, struct device_attribute *attr, char *buf) { struct bmp280_data *data = iio_priv(dev_to_iio_dev(dev)); @@ -605,17 +606,12 @@ static ssize_t bmp280_show_press_oversampling_avail(struct device *dev, return bmp280_show_avail(buf, data->chip_info->oversampling_press_avail, data->chip_info->num_oversampling_press_avail); } - -static IIO_DEVICE_ATTR(in_temp_oversampling_ratio_available, - S_IRUGO, bmp280_show_temp_oversampling_avail, NULL, 0); - -static IIO_DEVICE_ATTR(in_pressure_oversampling_ratio_available, - S_IRUGO, bmp280_show_press_oversampling_avail, NULL, 0); +static IIO_DEVICE_ATTR_RO(in_pressure_oversampling_ratio_available, 0); static struct attribute *bmp280_attributes[] = { &iio_dev_attr_in_temp_oversampling_ratio_available.dev_attr.attr, &iio_dev_attr_in_pressure_oversampling_ratio_available.dev_attr.attr, - NULL, + NULL }; static const struct attribute_group bmp280_attrs_group = { From patchwork Tue Mar 17 10:18:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 11442445 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 014BE913 for ; Tue, 17 Mar 2020 10:18:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D61B720753 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726416AbgCQKST (ORCPT ); Tue, 17 Mar 2020 06:18:19 -0400 Received: from mga04.intel.com ([192.55.52.120]:56031 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726077AbgCQKSR (ORCPT ); Tue, 17 Mar 2020 06:18:17 -0400 IronPort-SDR: zaXP5PnfHtxznsYlP1xIOw/giJ8T1+FBD/ndyGfstud32ZViw2YDSdBlSSnp4xjjB4IhgrVbnL fmqOjWYruo1A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:18:17 -0700 IronPort-SDR: 4p8dyT05L0WoVBKRSPo2LtHrsFjTiUqOlJEhfJKbPLu55TbAUUbSA9WHy+f6oE6Vhkmdm5Vr/N /noXgwroSSNA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="323785168" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 17 Mar 2020 03:18:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4886418B; Tue, 17 Mar 2020 12:18:14 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: Andy Shevchenko Subject: [PATCH v1 3/5] iio: pressure: bmp280: Explicitly mark GPIO optional Date: Tue, 17 Mar 2020 12:18:11 +0200 Message-Id: <20200317101813.30829-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> References: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Show by using a corresponding API call that GPIO is optional. Signed-off-by: Andy Shevchenko --- drivers/iio/pressure/bmp280-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 25be3ff1a6ab..6c2e47d92a11 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -1080,9 +1080,9 @@ int bmp280_common_probe(struct device *dev, usleep_range(data->start_up_time, data->start_up_time + 100); /* Bring chip out of reset if there is an assigned GPIO line */ - gpiod = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); + gpiod = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); /* Deassert the signal */ - if (!IS_ERR(gpiod)) { + if (gpiod) { dev_info(dev, "release reset\n"); gpiod_set_value(gpiod, 0); } From patchwork Tue Mar 17 10:18:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 11442441 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5BA8A14B4 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 469D120736 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726408AbgCQKSS (ORCPT ); Tue, 17 Mar 2020 06:18:18 -0400 Received: from mga14.intel.com ([192.55.52.115]:40545 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbgCQKSS (ORCPT ); Tue, 17 Mar 2020 06:18:18 -0400 IronPort-SDR: 8ufNkyB3I+P1a82zvodt+lLjcf5hzRxEjQt2RHwHqBOYhpVLMKuB11G6p9NL49YMLyYGhVyIim HLMSvd8XmDaQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:18:17 -0700 IronPort-SDR: sKmt4jPL+7no4K8LH2xGcL9GYsof+nS3oEgt9chHi/ZR8Xr1OwD57ENdJgqOGhluuiqvR77SWW xHrwG0dcxKUw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="244435168" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 17 Mar 2020 03:18:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5C49B22C; Tue, 17 Mar 2020 12:18:14 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: Andy Shevchenko Subject: [PATCH v1 4/5] iio: pressure: bmp280: Drop unneeded explicit castings Date: Tue, 17 Mar 2020 12:18:12 +0200 Message-Id: <20200317101813.30829-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> References: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org In few places the unnecessary explicit castings are being used. Drop them for good. Signed-off-by: Andy Shevchenko --- drivers/iio/pressure/bmp280-core.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 6c2e47d92a11..5db41b1df7eb 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -337,8 +337,7 @@ static int bmp280_read_temp(struct bmp280_data *data, __be32 tmp = 0; s32 adc_temp, comp_temp; - ret = regmap_bulk_read(data->regmap, BMP280_REG_TEMP_MSB, - (u8 *) &tmp, 3); + ret = regmap_bulk_read(data->regmap, BMP280_REG_TEMP_MSB, &tmp, 3); if (ret < 0) { dev_err(data->dev, "failed to read temperature\n"); return ret; @@ -377,8 +376,7 @@ static int bmp280_read_press(struct bmp280_data *data, if (ret < 0) return ret; - ret = regmap_bulk_read(data->regmap, BMP280_REG_PRESS_MSB, - (u8 *) &tmp, 3); + ret = regmap_bulk_read(data->regmap, BMP280_REG_PRESS_MSB, &tmp, 3); if (ret < 0) { dev_err(data->dev, "failed to read pressure\n"); return ret; @@ -400,8 +398,8 @@ static int bmp280_read_press(struct bmp280_data *data, static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2) { + __be16 tmp; int ret; - __be16 tmp = 0; s32 adc_humidity; u32 comp_humidity; @@ -410,8 +408,7 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2) if (ret < 0) return ret; - ret = regmap_bulk_read(data->regmap, BMP280_REG_HUMIDITY_MSB, - (u8 *) &tmp, 2); + ret = regmap_bulk_read(data->regmap, BMP280_REG_HUMIDITY_MSB, &tmp, 2); if (ret < 0) { dev_err(data->dev, "failed to read humidity\n"); return ret; @@ -747,14 +744,14 @@ static int bmp180_measure(struct bmp280_data *data, u8 ctrl_meas) static int bmp180_read_adc_temp(struct bmp280_data *data, int *val) { + __be16 tmp; int ret; - __be16 tmp = 0; ret = bmp180_measure(data, BMP180_MEAS_TEMP); if (ret) return ret; - ret = regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, (u8 *)&tmp, 2); + ret = regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, &tmp, 2); if (ret) return ret; @@ -851,7 +848,7 @@ static int bmp180_read_adc_press(struct bmp280_data *data, int *val) if (ret) return ret; - ret = regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, (u8 *)&tmp, 3); + ret = regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, &tmp, 3); if (ret) return ret; From patchwork Tue Mar 17 10:18:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 11442437 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 163A0913 for ; Tue, 17 Mar 2020 10:18:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0099E20736 for ; Tue, 17 Mar 2020 10:18:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725868AbgCQKSS (ORCPT ); Tue, 17 Mar 2020 06:18:18 -0400 Received: from mga12.intel.com ([192.55.52.136]:6312 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726408AbgCQKSR (ORCPT ); Tue, 17 Mar 2020 06:18:17 -0400 IronPort-SDR: fAlNObKfoq6Z4guHbFNAPzfdwuYxFi/CSawrC0LKCgGoIj6GqX9Gpz4oURMI+2hnbwATslJ45C twxRrcJbaPqg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:18:17 -0700 IronPort-SDR: DKrqioQIXbt4at0qExtnZ0pnnxB5MCXfOdcYevr456rlSIifVEW7vfzvF3pljHNF/0Pu3vQaf4 0q8tMIahmMsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="238236412" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 17 Mar 2020 03:18:15 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6663E19D; Tue, 17 Mar 2020 12:18:14 +0200 (EET) From: Andy Shevchenko To: Jonathan Cameron , linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler Cc: Andy Shevchenko Subject: [PATCH v1 5/5] iio: pressure: bmp280: Join string literals back Date: Tue, 17 Mar 2020 12:18:13 +0200 Message-Id: <20200317101813.30829-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> References: <20200317101813.30829-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org For easy grepping on debug purposes join string literals back in the messages. No functional change. Signed-off-by: Andy Shevchenko --- drivers/iio/pressure/bmp280-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c index 5db41b1df7eb..b8ff6806c00b 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -957,8 +957,7 @@ static int bmp085_fetch_eoc_irq(struct device *dev, irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq)); if (irq_trig != IRQF_TRIGGER_RISING) { - dev_err(dev, "non-rising trigger given for EOC interrupt, " - "trying to enforce it\n"); + dev_err(dev, "non-rising trigger given for EOC interrupt, trying to enforce it\n"); irq_trig = IRQF_TRIGGER_RISING; }