Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933060AbbBBIlw (ORCPT ); Mon, 2 Feb 2015 03:41:52 -0500 Received: from www.osadl.org ([62.245.132.105]:45569 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753006AbbBBIlv (ORCPT ); Mon, 2 Feb 2015 03:41:51 -0500 From: Nicholas Mc Guire To: Lars-Peter Clausen Cc: Michael Hennerich , Jonathan Cameron , Hartmut Knaack , Peter Meerwald , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH 3/3] iio: ad_sigma_delta: cleanup wait_for_completion return handling Date: Mon, 2 Feb 2015 03:37:38 -0500 Message-Id: <1422866258-10517-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1695 Lines: 48 return type of wait_for_completion_timeout is unsigned long not int, rather than introducing a new variable the wait_for_completion_timeout is moved into the if condition as the return value is only used to detect timeout. Signed-off-by: Nicholas Mc Guire --- Aside from the fixup of the wait_for_completion_timeout handling a minor coding style issue in the else branch was fixed - the {} is not needed for the one-line body. Patch was compile tested only for imx_v6_v7_defconfig + CONFIG_IIO=m CONFIG_STAGING=y, CONFIG_AD7780=m, CONFIG_AD_SIGMA_DELTA=m Patch is against 3.19.0-rc6 -next-20150130 drivers/iio/adc/ad_sigma_delta.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c index d10bd0c..fbc5824 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -196,14 +196,12 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta, sigma_delta->irq_dis = false; enable_irq(sigma_delta->spi->irq); - ret = wait_for_completion_timeout(&sigma_delta->completion, 2*HZ); - if (ret == 0) { + if (!wait_for_completion_timeout(&sigma_delta->completion, 2*HZ)) { sigma_delta->irq_dis = true; disable_irq_nosync(sigma_delta->spi->irq); ret = -EIO; - } else { + } else ret = 0; - } out: sigma_delta->bus_locked = false; spi_bus_unlock(sigma_delta->spi->master); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/