From patchwork Tue May 26 18:53:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225317 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 A72F4C433E0 for ; Tue, 26 May 2020 19:17:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E6CB208B3 for ; Tue, 26 May 2020 19:17:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520664; bh=ROkDuAVEAX5iprg27/OAqxRmFR4g+xJwM9tn3TX5o7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ul5Nqbjv75RMgq+2ad5qUnkeiQDYNGOTRsLKata0oUs8EH65kVwvAfDnA/k/s+mho n+RKctJfwMox48DwWeRvqgAds1uSmKKK1qqmJs9awJyAgTfdrMKQgdUS2RaBw3bsNe hnNmG/uDI3F9c+4GxXVFF/FeXKZ//aznKtsGIgCw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404349AbgEZTOT (ORCPT ); Tue, 26 May 2020 15:14:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:45058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404345AbgEZTOS (ORCPT ); Tue, 26 May 2020 15:14:18 -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 223CB20776; Tue, 26 May 2020 19:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520457; bh=ROkDuAVEAX5iprg27/OAqxRmFR4g+xJwM9tn3TX5o7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Izso1PozQOLxXMT7JbzGCU8SlFIRfxz/EKQebsEaNcvVHO4iCoFgKNEr2sTwtZAnM bpr1jb7fkAIhjLswOfRJnTK/Grq3hBIHGw71zzm61ACBYRmv46syk1GYscoMG1ayGY DRrVrvK39xiLYQtfI6pNeU7jXmADDp8D8yi59VQk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Russell King , Christoph Hellwig , Ludovic Barre , Linus Walleij , Arnd Bergmann , Ulf Hansson , Sasha Levin Subject: [PATCH 5.6 087/126] Revert "driver core: platform: Initialize dma_parms for platform devices" Date: Tue, 26 May 2020 20:53:44 +0200 Message-Id: <20200526183945.302867078@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 1d2a14649ef5b5eb64ea5ce276d7df502bac4dbe ] [ Upstream commit 885a64715fd81e6af6d94a038556e0b2e6deb19c ] This reverts commit 7c8978c0837d40c302f5e90d24c298d9ca9fc097, a new version will come in the next release cycle. 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 Signed-off-by: Sasha Levin --- drivers/base/platform.c | 2 -- include/linux/platform_device.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index c81b68d5d66d..b5ce7b085795 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -361,8 +361,6 @@ struct platform_object { */ static void setup_pdev_dma_masks(struct platform_device *pdev) { - pdev->dev.dma_parms = &pdev->dma_parms; - if (!pdev->dev.coherent_dma_mask) pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); if (!pdev->dev.dma_mask) { diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 81900b3cbe37..041bfa412aa0 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -25,7 +25,6 @@ struct platform_device { bool id_auto; struct device dev; u64 platform_dma_mask; - struct device_dma_parameters dma_parms; u32 num_resources; struct resource *resource;