lkml.org 
[lkml]   [2021]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 046/100] parisc: Move pci_dev_is_behind_card_dino to where it is used
    Date
    From: Guenter Roeck <linux@roeck-us.net>

    [ Upstream commit 907872baa9f1538eed02ec737b8e89eba6c6e4b9 ]

    parisc build test images fail to compile with the following error.

    drivers/parisc/dino.c:160:12: error:
    'pci_dev_is_behind_card_dino' defined but not used

    Move the function just ahead of its only caller to avoid the error.

    Fixes: 5fa1659105fa ("parisc: Disable HP HSC-PCI Cards to prevent kernel crash")
    Cc: Helge Deller <deller@gmx.de>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/parisc/dino.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
    index 889d7ce282eb..952a92504df6 100644
    --- a/drivers/parisc/dino.c
    +++ b/drivers/parisc/dino.c
    @@ -156,15 +156,6 @@ static inline struct dino_device *DINO_DEV(struct pci_hba_data *hba)
    return container_of(hba, struct dino_device, hba);
    }

    -/* Check if PCI device is behind a Card-mode Dino. */
    -static int pci_dev_is_behind_card_dino(struct pci_dev *dev)
    -{
    - struct dino_device *dino_dev;
    -
    - dino_dev = DINO_DEV(parisc_walk_tree(dev->bus->bridge));
    - return is_card_dino(&dino_dev->hba.dev->id);
    -}
    -
    /*
    * Dino Configuration Space Accessor Functions
    */
    @@ -447,6 +438,15 @@ static void quirk_cirrus_cardbus(struct pci_dev *dev)
    DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6832, quirk_cirrus_cardbus );

    #ifdef CONFIG_TULIP
    +/* Check if PCI device is behind a Card-mode Dino. */
    +static int pci_dev_is_behind_card_dino(struct pci_dev *dev)
    +{
    + struct dino_device *dino_dev;
    +
    + dino_dev = DINO_DEV(parisc_walk_tree(dev->bus->bridge));
    + return is_card_dino(&dino_dev->hba.dev->id);
    +}
    +
    static void pci_fixup_tulip(struct pci_dev *dev)
    {
    if (!pci_dev_is_behind_card_dino(dev))
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-09-24 15:03    [W:2.523 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site