From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2A34C43331 for ; Wed, 1 Apr 2020 06:21:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DE9520787 for ; Wed, 1 Apr 2020 06:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585722067; bh=uj7LvWZOb+p67uSX4+/oq9M/8wHX9Nf3th1iXJiAJ2w=; h=Subject:To:From:Date:List-ID:From; b=oDIIcVomCZfKHU1UNfSEx1cVE+t047wo6GerbxfKTJtQkKSmfwESkXgfVF8sIJD5j ulgCvvNsoihy85/Ob7D6zBGuWf7timN3rP2PmyR+kVa/cfQN11JKexsYzDXhVw5sDe 4e+r/aCnZC4PES54BRVzJ9tpLo4Ml4m0/SceesqI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731702AbgDAGVG (ORCPT ); Wed, 1 Apr 2020 02:21:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:33830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731683AbgDAGVG (ORCPT ); Wed, 1 Apr 2020 02:21:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C1C1720719; Wed, 1 Apr 2020 06:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585722066; bh=uj7LvWZOb+p67uSX4+/oq9M/8wHX9Nf3th1iXJiAJ2w=; h=Subject:To:From:Date:From; b=PizJTmUVwCvhHBF96kbujydB0IyFf1IEjsYd+9cPXSUuYicAXLEflp6UP0BSJJwTN uANNVAieUkHOcPFHUgHBBLnO+0xabu9rmnfCV8zFn2jgNVoYtGft2nfVtOwjhJD1Xo t+NlwAAwo5E/4aT1xgA10FMXC4dtgNDVrZ8HmRn4= Subject: patch "Revert "amba: Initialize dma_parms for amba devices"" added to char-misc-next To: gregkh@linuxfoundation.org, arnd@arndb.de, hch@lst.de, linus.walleij@linaro.org, linux@armlinux.org.uk, ludovic.barre@st.com, stable@vger.kernel.org, ulf.hansson@linaro.org From: Date: Wed, 01 Apr 2020 08:21:04 +0200 Message-ID: <15857220649169@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled Revert "amba: Initialize dma_parms for amba devices" to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From a9d68cbd4f8834d126ebdd3097a1dee1c5973fdf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Apr 2020 08:03:28 +0200 Subject: Revert "amba: Initialize dma_parms for amba devices" This reverts commit 5caf6102e32ead7ed5d21b5309c1a4a7d70e6a9f. It still needs some more work and that will happen for the next release cycle, not this one. Cc: Cc: Russell King Cc: Christoph Hellwig Cc: Ludovic Barre Cc: Linus Walleij Cc: Arnd Bergmann Cc: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/amba/bus.c | 2 -- include/linux/amba/bus.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 5e61783ce92d..fe1523664816 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -374,8 +374,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent) WARN_ON(dev->irq[0] == (unsigned int)-1); WARN_ON(dev->irq[1] == (unsigned int)-1); - dev->dev.dma_parms = &dev->dma_parms; - ret = request_resource(parent, &dev->res); if (ret) goto err_out; diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 0bbfd647f5c6..26f0ecf401ea 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -65,7 +65,6 @@ struct amba_device { struct device dev; struct resource res; struct clk *pclk; - struct device_dma_parameters dma_parms; unsigned int periphid; unsigned int cid; struct amba_cs_uci_id uci; -- 2.26.0