Messages in this thread | | | Date | Tue, 16 Sep 2014 20:20:12 -0700 | From | Martin Kelly <> | Subject | Re: [PATCH v2] x86/pmc_atom: Fix warning when CONFIG_DEBUG_FS=n |
| |
On 09/16/2014 07:09 PM, Li, Aubrey wrote: > > Thanks to take care of this warning. How about this version? > > diff --git a/arch/x86/kernel/pmc_atom.c b/arch/x86/kernel/pmc_atom.c > index 0c424a6..cd91b57 100644 > --- a/arch/x86/kernel/pmc_atom.c > +++ b/arch/x86/kernel/pmc_atom.c > @@ -240,7 +240,7 @@ err: > static int pmc_setup_dev(struct pci_dev *pdev) > { > struct pmc_dev *pmc = &pmc_device; > - int ret; > + int ret = 0; > > /* Obtain ACPI base address */ > pci_read_config_dword(pdev, ACPI_BASE_ADDR_OFFSET, &acpi_base_addr); > @@ -269,7 +269,7 @@ static int pmc_setup_dev(struct pci_dev *pdev) > return ret; > } > #endif /* CONFIG_DEBUG_FS */ > - return 0; > + return ret; > } > > /* > > Thanks, > -Aubrey >
Thanks for the suggestion, Aubrey. Although that version would also work, it still has inline #ifdef, which is harder to read and goes against general Linux conventions:
https://www.kernel.org/doc/Documentation/SubmittingPatches (section 2, "#ifdefs are ugly")
| |