Re: [PATCH v2 07/19] powerpc/powermac: Make some functions static

[Mathieu Malaterre]

This one should also be good to go.

On Wed, Mar 28, 2018 at 9:39 PM Mathieu Malaterre <malat@xxxxxxxxxx> wrote:
>
> These functions can all be static, make it so. Fix warnings treated as
> errors with W=1:
>
>   arch/powerpc/platforms/powermac/pci.c:1022:6: error: no previous prototype for âpmac_pci_fixup_ohciâ [-Werror=missing-prototypes]
>   arch/powerpc/platforms/powermac/pci.c:1057:6: error: no previous prototype for âpmac_pci_fixup_cardbusâ [-Werror=missing-prototypes]
>   arch/powerpc/platforms/powermac/pci.c:1094:6: error: no previous prototype for âpmac_pci_fixup_pciataâ [-Werror=missing-prototypes]
>
> Remove has_address declaration and assignment since not used. Also add gcc
> attribute unused to fix a warning treated as error with W=1:
>
>   arch/powerpc/platforms/powermac/pci.c:784:19: error: variable âhas_addressâ set but not used [-Werror=unused-but-set-variable]
>   arch/powerpc/platforms/powermac/pci.c:907:22: error: variable âhtâ set but not used [-Werror=unused-but-set-variable]
>
> Suggested-by: Christophe Leroy <christophe.leroy@xxxxxx>
> Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
> ---
> v2: remove has_address variable since not used
>  arch/powerpc/platforms/powermac/pci.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
> index 0b8174a79993..67c497093e0a 100644
> --- a/arch/powerpc/platforms/powermac/pci.c
> +++ b/arch/powerpc/platforms/powermac/pci.c
> @@ -781,12 +781,12 @@ static int __init pmac_add_bridge(struct device_node *dev)
>         struct resource rsrc;
>         char *disp_name;
>         const int *bus_range;
> -       int primary = 1, has_address = 0;
> +       int primary = 1;
>
>         DBG("Adding PCI host bridge %pOF\n", dev);
>
>         /* Fetch host bridge registers address */
> -       has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
> +       of_address_to_resource(dev, 0, &rsrc);
>
>         /* Get bus range if any */
>         bus_range = of_get_property(dev, "bus-range", &len);
> @@ -904,7 +904,7 @@ static int pmac_pci_root_bridge_prepare(struct pci_host_bridge *bridge)
>  void __init pmac_pci_init(void)
>  {
>         struct device_node *np, *root;
> -       struct device_node *ht = NULL;
> +       struct device_node *ht __maybe_unused = NULL;
>
>         pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN);
>
> @@ -1019,7 +1019,7 @@ static bool pmac_pci_enable_device_hook(struct pci_dev *dev)
>         return true;
>  }
>
> -void pmac_pci_fixup_ohci(struct pci_dev *dev)
> +static void pmac_pci_fixup_ohci(struct pci_dev *dev)
>  {
>         struct device_node *node = pci_device_to_OF_node(dev);
>
> @@ -1054,7 +1054,7 @@ void __init pmac_pcibios_after_init(void)
>         }
>  }
>
> -void pmac_pci_fixup_cardbus(struct pci_dev* dev)
> +static void pmac_pci_fixup_cardbus(struct pci_dev *dev)
>  {
>         if (!machine_is(powermac))
>                 return;
> @@ -1091,7 +1091,7 @@ void pmac_pci_fixup_cardbus(struct pci_dev* dev)
>
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TI, PCI_ANY_ID, pmac_pci_fixup_cardbus);
>
> -void pmac_pci_fixup_pciata(struct pci_dev* dev)
> +static void pmac_pci_fixup_pciata(struct pci_dev *dev)
>  {
>         u8 progif = 0;
>
> --
> 2.11.0
>