From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933051AbbBBIer (ORCPT ); Mon, 2 Feb 2015 03:34:47 -0500 Received: from www.osadl.org ([62.245.132.105]:45225 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932717AbbBBIep (ORCPT ); Mon, 2 Feb 2015 03:34:45 -0500 From: Nicholas Mc Guire To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH 1/5] spi: match var type to return type of wait_for_completion Date: Mon, 2 Feb 2015 03:30:32 -0500 Message-Id: <1422865837-10357-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 From: Nicholas Mc Guire return type of wait_for_completion_timeout is unsigned long not int, this patch changes the type of m from int to unsigned long. Signed-off-by: Nicholas Mc Guire --- The return type of wait_for_completion_timeout is unsigned long not int. This patch resolves the type missmatch by changing the type to unsigned long. This patch was only compile tested with x86_64_defconfig + CONFIG_SPI=y Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b9fb711..c64a3e5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -784,7 +784,7 @@ static int spi_transfer_one_message(struct spi_master *master, struct spi_transfer *xfer; bool keep_cs = false; int ret = 0; - int ms = 1; + unsigned long ms = 1; spi_set_cs(msg->spi, true); -- 1.7.10.4