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 1BED7C43331 for ; Wed, 1 Apr 2020 06:21:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E30F62077D for ; Wed, 1 Apr 2020 06:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585722076; bh=Tkk/uHxqPeMU3ux12KBY/NRWjcGC3iKm26UzQzvnNsk=; h=Subject:To:From:Date:List-ID:From; b=Bzc0VnVb1vsDprtuXg3UkhQ+qRdcFH7bvWcrJ1z4bgzSZdKPpXPhm8HKUX1Oues9Z rOqS9v9fm6Adcxqm3aS3wLY2Hn2E0yAV8hKeCho2rS2Tsdhjn3xZd5OZgrSNGKL4NJ /ahtKs/IEenWHodqScXFfGdhwiMj6uOnXtPxSxas= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731721AbgDAGVP (ORCPT ); Wed, 1 Apr 2020 02:21:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:33936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731683AbgDAGVP (ORCPT ); Wed, 1 Apr 2020 02:21:15 -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 1118820719; Wed, 1 Apr 2020 06:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585722074; bh=Tkk/uHxqPeMU3ux12KBY/NRWjcGC3iKm26UzQzvnNsk=; h=Subject:To:From:Date:From; b=c0SKfnx+pMJjbP01CCjPRQ74apP5K/nXBocFwLfnd7LoOY86sffAYLNJt9CAu3ets wfxA/bTaP7aDKExflEUgliDwsiCxCPX2Dgp/rvRJdyEPd3STEorHOqmavjjBWrvAes tMfq0+D3NsEPOskPN6Bw/6EDHFHoDklCnDyRqNjY= Subject: patch "Revert "driver core: platform: Initialize dma_parms for platform" 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: <1585722064122122@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 "driver core: platform: Initialize dma_parms for platform 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 885a64715fd81e6af6d94a038556e0b2e6deb19c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Apr 2020 08:06:54 +0200 Subject: Revert "driver core: platform: Initialize dma_parms for platform devices" 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 --- drivers/base/platform.c | 1 - include/linux/platform_device.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 46abbfb52655..b5ce7b085795 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -512,7 +512,6 @@ int platform_device_add(struct platform_device *pdev) pdev->dev.parent = &platform_bus; pdev->dev.bus = &platform_bus_type; - pdev->dev.dma_parms = &pdev->dma_parms; switch (pdev->id) { default: 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; -- 2.26.0