* [PATCH] parisc: Move pci_dev_is_behind_card_dino to where it is used
@ 2021-09-08 15:30 Guenter Roeck
2021-09-08 20:51 ` Helge Deller
0 siblings, 1 reply; 2+ messages in thread
From: Guenter Roeck @ 2021-09-08 15:30 UTC (permalink / raw)
To: James E . J . Bottomley
Cc: linux-parisc, linux-kernel, Guenter Roeck, Helge Deller
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] parisc: Move pci_dev_is_behind_card_dino to where it is used
2021-09-08 15:30 [PATCH] parisc: Move pci_dev_is_behind_card_dino to where it is used Guenter Roeck
@ 2021-09-08 20:51 ` Helge Deller
0 siblings, 0 replies; 2+ messages in thread
From: Helge Deller @ 2021-09-08 20:51 UTC (permalink / raw)
To: Guenter Roeck, James E . J . Bottomley; +Cc: linux-parisc, linux-kernel
On 9/8/21 5:30 PM, Guenter Roeck wrote:
> 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>
applied to the parisc tree.
Thanks!
Helge
> ---
> 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))
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-08 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 15:30 [PATCH] parisc: Move pci_dev_is_behind_card_dino to where it is used Guenter Roeck
2021-09-08 20:51 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).