On Sun, Mar 29, 2020 at 10:23 PM Alastair D'Silva <alastair@xxxxxxxxxxx> wrote: > > Function declarations don't need externs, remove the existing ones > so they are consistent with newer code > > Signed-off-by: Alastair D'Silva <alastair@xxxxxxxxxxx> > Acked-by: Andrew Donnellan <ajd@xxxxxxxxxxxxx> > Acked-by: Frederic Barrat <fbarrat@xxxxxxxxxxxxx> Looks good. > --- > arch/powerpc/include/asm/pnv-ocxl.h | 40 ++++++++++++++--------------- > include/misc/ocxl.h | 6 ++--- > 2 files changed, 22 insertions(+), 24 deletions(-) > > diff --git a/arch/powerpc/include/asm/pnv-ocxl.h b/arch/powerpc/include/asm/pnv-ocxl.h > index 560a19bb71b7..205efc41a33c 100644 > --- a/arch/powerpc/include/asm/pnv-ocxl.h > +++ b/arch/powerpc/include/asm/pnv-ocxl.h > @@ -9,29 +9,27 @@ > #define PNV_OCXL_TL_BITS_PER_RATE 4 > #define PNV_OCXL_TL_RATE_BUF_SIZE ((PNV_OCXL_TL_MAX_TEMPLATE+1) * PNV_OCXL_TL_BITS_PER_RATE / 8) > > -extern int pnv_ocxl_get_actag(struct pci_dev *dev, u16 *base, u16 *enabled, > - u16 *supported); > -extern int pnv_ocxl_get_pasid_count(struct pci_dev *dev, int *count); > +int pnv_ocxl_get_actag(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); > +int pnv_ocxl_get_pasid_count(struct pci_dev *dev, int *count); > > -extern int pnv_ocxl_get_tl_cap(struct pci_dev *dev, long *cap, > +int pnv_ocxl_get_tl_cap(struct pci_dev *dev, long *cap, > char *rate_buf, int rate_buf_size); > -extern int pnv_ocxl_set_tl_conf(struct pci_dev *dev, long cap, > - uint64_t rate_buf_phys, int rate_buf_size); > - > -extern int pnv_ocxl_get_xsl_irq(struct pci_dev *dev, int *hwirq); > -extern void pnv_ocxl_unmap_xsl_regs(void __iomem *dsisr, void __iomem *dar, > - void __iomem *tfc, void __iomem *pe_handle); > -extern int pnv_ocxl_map_xsl_regs(struct pci_dev *dev, void __iomem **dsisr, > - void __iomem **dar, void __iomem **tfc, > - void __iomem **pe_handle); > - > -extern int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask, > - void **platform_data); > -extern void pnv_ocxl_spa_release(void *platform_data); > -extern int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle); > - > -extern int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr); > -extern void pnv_ocxl_free_xive_irq(u32 irq); > +int pnv_ocxl_set_tl_conf(struct pci_dev *dev, long cap, > + uint64_t rate_buf_phys, int rate_buf_size); > + > +int pnv_ocxl_get_xsl_irq(struct pci_dev *dev, int *hwirq); > +void pnv_ocxl_unmap_xsl_regs(void __iomem *dsisr, void __iomem *dar, > + void __iomem *tfc, void __iomem *pe_handle); > +int pnv_ocxl_map_xsl_regs(struct pci_dev *dev, void __iomem **dsisr, > + void __iomem **dar, void __iomem **tfc, > + void __iomem **pe_handle); > + > +int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask, void **platform_data); > +void pnv_ocxl_spa_release(void *platform_data); > +int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle); > + > +int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr); > +void pnv_ocxl_free_xive_irq(u32 irq); > u64 pnv_ocxl_platform_lpc_setup(struct pci_dev *pdev, u64 size); > void pnv_ocxl_platform_lpc_release(struct pci_dev *pdev); > > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 06dd5839e438..0a762e387418 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -173,7 +173,7 @@ int ocxl_context_detach(struct ocxl_context *ctx); > * > * Returns 0 on success, negative on failure > */ > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > > /** > * Frees an IRQ associated with an AFU context > @@ -182,7 +182,7 @@ extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > * > * Returns 0 on success, negative on failure > */ > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > > /** > * Gets the address of the trigger page for an IRQ > @@ -193,7 +193,7 @@ extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > * > * returns the trigger page address, or 0 if the IRQ is not valid > */ > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > > /** > * Provide a callback to be called when an IRQ is triggered > -- > 2.24.1 >
