Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758943Ab1FWCA6 (ORCPT ); Wed, 22 Jun 2011 22:00:58 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:58820 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758922Ab1FWCA4 (ORCPT ); Wed, 22 Jun 2011 22:00:56 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=NePc0dnCVB8Z0xquYW98FScBApPmfRwk8CKog3U3eNo4dRTgpGYYGcNqsENXtPmiRk M0lIn/3IP4kDTeqCIgYfDk0gNQ8DUQfkcCC6obnOGoEacmv8EwCxclG07geAyeHqwQ3G cWl57Xe3YtoMkajChf0kmE+WSJR+nzn3RBUrA= From: dirk.brandewie@gmail.com To: linux-kernel@vger.kernel.org, spi-devel-general@lists.sourceforge.net Cc: Dirk Brandewie Subject: [PATCH 10/11] spi-dw: Move checking of max_speed_hz value to be a prerequisite in spi_dw_setup Date: Wed, 22 Jun 2011 19:00:12 -0700 Message-Id: <1308794413-11069-11-git-send-email-dirk.brandewie@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1308794413-11069-1-git-send-email-dirk.brandewie@gmail.com> References: <1308794413-11069-1-git-send-email-dirk.brandewie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1309 Lines: 45 From: Dirk Brandewie Move the check of spi->max_speed_hz to be a prerequisite of spi_dw_setup(). Signed-off-by: Dirk Brandewie --- drivers/spi/spi-dw.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 35b952b..7b3f607 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -634,6 +634,11 @@ static int spi_dw_setup(struct spi_device *spi) if (spi->bits_per_word != 8 && spi->bits_per_word != 16) return -EINVAL; + if (!spi->max_speed_hz) { + dev_err(&spi->dev, "No max speed HZ parameter\n"); + return -EINVAL; + } + /* Only alloc on first setup */ chip = spi_get_ctldata(spi); if (!chip) { @@ -675,10 +680,6 @@ static int spi_dw_setup(struct spi_device *spi) } chip->bits_per_word = spi->bits_per_word; - if (!spi->max_speed_hz) { - dev_err(&spi->dev, "No max speed HZ parameter\n"); - return -EINVAL; - } chip->speed_hz = spi->max_speed_hz; chip->tmode = 0; /* Tx & Rx */ -- 1.7.3.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/