From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753065AbcCAVak (ORCPT <rfc822;w@1wt.eu>);
	Tue, 1 Mar 2016 16:30:40 -0500
Received: from mout.kundenserver.de ([212.227.126.134]:53201 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751892AbcCAVai (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 1 Mar 2016 16:30:38 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Alexandre Courbot <acourbot@nvidia.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
        Stephen Warren <swarren@wwwdotorg.org>,
        Thierry Reding <thierry.reding@gmail.com>, linux-mmc@vger.kernel.org,
        linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
        gnurou@gmail.com
Subject: Re: [PATCH v2 1/2] mmc: sdhci: Set DMA mask
Date: Tue, 01 Mar 2016 22:30:26 +0100
Message-ID: <12391836.3mgJ3uDMLr@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <1456806764-16467-2-git-send-email-acourbot@nvidia.com>
References: <1456806764-16467-1-git-send-email-acourbot@nvidia.com> <1456806764-16467-2-git-send-email-acourbot@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:ZBJC40KeIm/7nir1qieBPfzcqVzn3ZdiabGAl8yMHIHjoKhVS19
 6vSEsH9KOaEg3tjzlipLAww3BhuLNopuNlqq6ph4AZ50JOjHTopW82WT3ZcZVnRlGOh5eta
 Jj+Upq81ll2hSPkWjOSrMqdlHgSaSx3+cbpxvpF5coXFlXVQ8aLFYoNmQHXiFT1MV4pPX2o
 M6QW4jnCo7E1hxl0UdPcA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:wbpEaHF7oxU=:XA44cLKAW6fXfNGJkcbDC6
 Jdpf9luzxwt2XhVCR0gruV/Dxw/J3w3BjzSCzsOIbjYByqPOrYNXsVIBqSTX2qfp/Pv5SyFMi
 6oGrC5F+kRlKcXcYWrj5vVL+5O6ahYLMs22ZTUuxQJgtPQJhKYNv2yEirN2MsK1gU5VC2wei7
 nfeWY03gzcvtjR/OLtGGWeW+MW1sEsCbFOzzx5pTwvK+p1b9TugiMBcaqew0ksMv8Df8KSNDq
 M72RCM3jAub1BT0s0iOd10IeRFQl0wLqbf9WS+OFa9yjHu573DorN64ltYuqZ4bBO6Mh8dW+J
 hcEwkxwkfX9WNCY0mo03tMxzQKWuk8+14ryPXqAQmIKpXZIhMUyr/nud8F+dahCY21uhKoN9y
 DoqPFcJmvRHxv1wPKEZoKT0Z8XW5DUNQY4/7GcsYiwtbf1wlzh1JzQRjobZh1YmxQ+sjvKrBu
 84cZXtq1GPQ71aERbJnowHLsvj1yq0TYjhpTin762Gf9fc1lS8qYoqN6o06szaxomU3xmJxkQ
 n77R/OXzE6l7LB46+dhGnNYhfGxwcRVtLzlMqNeVBJGvQNNmjBVH0FRO4oInl6ltnNRfKaFHY
 HBj4kI7rd6TQa026ncGlqLtF/N0eKheV58P5kPFREiu7O3W2VkTqVlwiULpmYxzj0fCJYxf/d
 CLtSaLNpHDj88Vvol29QVdjpcknZcIyHMdzVQJnScIynFCy17ZgU7s1cc0hcrj9D1Nfr/O5lB
 Dl0Bw1dQq2a6yHy7
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tuesday 01 March 2016 13:32:43 Alexandre Courbot wrote:
>          */
> -       if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA))) {
> +       if (!(host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)))
>                 host->dma_mask = DMA_BIT_MASK(64);
> -               mmc_dev(mmc)->dma_mask = &host->dma_mask;
> -       }
> +
> +       if (host->dma_mask &&
> +           dma_set_mask_and_coherent(mmc_dev(mmc), host->dma_mask))
> +               pr_warn("%s: cannot set DMA mask\n", mmc_hostname(mmc));
> 

Looks good, 

Acked-by: Arnd Bergmann <arnd@arndb.de>