lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 166/606] Revert "driver core: platform: Initialize dma_parms for platform devices"
    Date
    [ Upstream commit 1d2a14649ef5b5eb64ea5ce276d7df502bac4dbe ]

    [ Upstream commit 885a64715fd81e6af6d94a038556e0b2e6deb19c ]

    This reverts commit 7c8978c0837d40c302f5e90d24c298d9ca9fc097, a new
    version will come in the next release cycle.

    Cc: <stable@vger.kernel.org>
    Cc: Russell King <linux@armlinux.org.uk>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Ludovic Barre <ludovic.barre@st.com>
    Cc: Linus Walleij <linus.walleij@linaro.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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;

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:32    [W:4.146 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site