| Message ID | 20180322202007.23088-8-malat@debian.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | powerpc/ppc32: make W=1 compilation errors free | expand |
Le 22/03/2018 à 21:19, Mathieu Malaterre a écrit : > 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] > > 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] > > Signed-off-by: Mathieu Malaterre <malat@debian.org> > --- > arch/powerpc/platforms/powermac/pci.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c > index 0b8174a79993..d3b9818dd880 100644 > --- a/arch/powerpc/platforms/powermac/pci.c > +++ b/arch/powerpc/platforms/powermac/pci.c > @@ -781,7 +781,7 @@ 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, has_address __maybe_unused = 0; YOu could remove it completely, it is never used > > DBG("Adding PCI host bridge %pOF\n", dev); > > @@ -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; Shouldn't ht be enclosed into #ifdef CONFIG_PPC64 instead ? Christophe > > 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; > > --- L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast. https://www.avast.com/antivirus -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 0b8174a79993..d3b9818dd880 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -781,7 +781,7 @@ 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, has_address __maybe_unused = 0; DBG("Adding PCI host bridge %pOF\n", dev); @@ -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;
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] 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] Signed-off-by: Mathieu Malaterre <malat@debian.org> --- arch/powerpc/platforms/powermac/pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)