Skip to contentSkip to conversation

patch "iio: fix some warning messages" added to staging-linus

PATCH [email protected] 1 participant 1 message Dec 1, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: fix some warning messages

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 231bfe53c57e89857753c940192acba933cba56c Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Sat, 21 Nov 2015 13:33:00 +0300
Subject: iio: fix some warning messages

WARN_ON() only takes a condition argument. I have changed these to WARN() instead.

---
 drivers/iio/industrialio-buffer.c | 2 +-
 drivers/iio/industrialio-core.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iio/industrialio-buffer.c +1 -1
index d7e908acb480..0f6f63b20263 100644
@@ -302,7 +302,7 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev,
 	if (trialmask == NULL)
 		return -ENOMEM;
 	if (!indio_dev->masklength) {
-		WARN_ON("Trying to set scanmask prior to registering buffer\n");
+		WARN(1, "Trying to set scanmask prior to registering buffer\n");
 		goto err_invalid_mask;
 	}
 	bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength);
drivers/iio/industrialio-core.c +1 -1
index 208358f9e7e3..159ede61f793 100644
@@ -655,7 +655,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
 			break;
 		case IIO_SEPARATE:
 			if (!chan->indexed) {
-				WARN_ON("Differential channels must be indexed\n");
+				WARN(1, "Differential channels must be indexed\n");
 				ret = -EINVAL;
 				goto error_free_full_postfix;
 			}
Signature · 1 line
2.6.2