Title: [8601] trunk/drivers/staging/iio/meter: power meter drivers: clean-up
- Revision
- 8601
- Author
- bhsong
- Date
- 2010-04-02 06:13:27 -0400 (Fri, 02 Apr 2010)
Log Message
power meter drivers: clean-up
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/meter/ade7754.c (8600 => 8601)
--- trunk/drivers/staging/iio/meter/ade7754.c 2010-04-02 10:05:34 UTC (rev 8600)
+++ trunk/drivers/staging/iio/meter/ade7754.c 2010-04-02 10:13:27 UTC (rev 8601)
@@ -458,7 +458,6 @@
}
ade7754_reset(dev);
- dev_err(dev, "device not playing ball -> reset");
msleep(ADE7754_STARTUP_DELAY);
err_ret:
Modified: trunk/drivers/staging/iio/meter/ade7758.c (8600 => 8601)
--- trunk/drivers/staging/iio/meter/ade7758.c 2010-04-02 10:05:34 UTC (rev 8600)
+++ trunk/drivers/staging/iio/meter/ade7758.c 2010-04-02 10:13:27 UTC (rev 8601)
@@ -475,7 +475,6 @@
}
ade7758_reset(dev);
- dev_err(dev, "device not playing ball -> reset");
msleep(ADE7758_STARTUP_DELAY);
err_ret:
Modified: trunk/drivers/staging/iio/meter/ade7759.c (8600 => 8601)
--- trunk/drivers/staging/iio/meter/ade7759.c 2010-04-02 10:05:34 UTC (rev 8600)
+++ trunk/drivers/staging/iio/meter/ade7759.c 2010-04-02 10:13:27 UTC (rev 8601)
@@ -391,7 +391,6 @@
}
ade7759_reset(dev);
- dev_err(dev, "device not playing ball -> reset");
msleep(ADE7759_STARTUP_DELAY);
err_ret:
Modified: trunk/drivers/staging/iio/meter/ade7854.c (8600 => 8601)
--- trunk/drivers/staging/iio/meter/ade7854.c 2010-04-02 10:05:34 UTC (rev 8600)
+++ trunk/drivers/staging/iio/meter/ade7854.c 2010-04-02 10:13:27 UTC (rev 8601)
@@ -465,7 +465,6 @@
}
ade7854_reset(dev);
- dev_err(dev, "device not playing ball -> reset");
msleep(ADE7854_STARTUP_DELAY);
err_ret:
@@ -635,6 +634,8 @@
if (ret)
goto error_remove_trigger;
+ return 0;
+
error_remove_trigger:
if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
ade7854_remove_trigger(st->indio_dev);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
