lkml.org 
[lkml]   [2019]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers
    Date
    From: Alastair D'Silva <alastair@d-silva.org>

    The 'extern' keyword adds no value here.

    Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
    ---
    drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++----------------
    include/misc/ocxl.h | 36 ++++++++++-----------
    2 files changed, 44 insertions(+), 46 deletions(-)

    diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h
    index a32f2151029f..321b29e77f45 100644
    --- a/drivers/misc/ocxl/ocxl_internal.h
    +++ b/drivers/misc/ocxl/ocxl_internal.h
    @@ -16,7 +16,6 @@

    extern struct pci_driver ocxl_pci_driver;

    -
    struct ocxl_fn {
    struct device dev;
    int bar_used[3];
    @@ -92,41 +91,40 @@ struct ocxl_process_element {
    __be32 software_state;
    };

    +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu);
    +void ocxl_afu_put(struct ocxl_afu *afu);

    -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu);
    -extern void ocxl_afu_put(struct ocxl_afu *afu);
    -
    -extern int ocxl_create_cdev(struct ocxl_afu *afu);
    -extern void ocxl_destroy_cdev(struct ocxl_afu *afu);
    -extern int ocxl_register_afu(struct ocxl_afu *afu);
    -extern void ocxl_unregister_afu(struct ocxl_afu *afu);
    +int ocxl_create_cdev(struct ocxl_afu *afu);
    +void ocxl_destroy_cdev(struct ocxl_afu *afu);
    +int ocxl_register_afu(struct ocxl_afu *afu);
    +void ocxl_unregister_afu(struct ocxl_afu *afu);

    -extern int ocxl_file_init(void);
    -extern void ocxl_file_exit(void);
    +int ocxl_file_init(void);
    +void ocxl_file_exit(void);

    -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size);
    -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size);
    -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size);
    -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size);
    +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size);
    +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size);
    +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size);
    +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size);

    -extern struct ocxl_context *ocxl_context_alloc(void);
    -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu,
    +struct ocxl_context *ocxl_context_alloc(void);
    +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu,
    struct address_space *mapping);
    -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr);
    -extern int ocxl_context_mmap(struct ocxl_context *ctx,
    +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr);
    +int ocxl_context_mmap(struct ocxl_context *ctx,
    struct vm_area_struct *vma);
    -extern int ocxl_context_detach(struct ocxl_context *ctx);
    -extern void ocxl_context_detach_all(struct ocxl_afu *afu);
    -extern void ocxl_context_free(struct ocxl_context *ctx);
    +int ocxl_context_detach(struct ocxl_context *ctx);
    +void ocxl_context_detach_all(struct ocxl_afu *afu);
    +void ocxl_context_free(struct ocxl_context *ctx);

    -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu);
    -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu);
    +int ocxl_sysfs_add_afu(struct ocxl_afu *afu);
    +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu);

    -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset);
    -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset);
    -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx);
    -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset,
    +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset);
    +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset);
    +void ocxl_afu_irq_free_all(struct ocxl_context *ctx);
    +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset,
    int eventfd);
    -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset);
    +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset);

    #endif /* _OCXL_INTERNAL_H_ */
    diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h
    index 9ff6ddc28e22..4544573cc93c 100644
    --- a/include/misc/ocxl.h
    +++ b/include/misc/ocxl.h
    @@ -53,7 +53,7 @@ struct ocxl_fn_config {
    * Read the configuration space of a function and fill in a
    * ocxl_fn_config structure with all the function details
    */
    -extern int ocxl_config_read_function(struct pci_dev *dev,
    +int ocxl_config_read_function(struct pci_dev *dev,
    struct ocxl_fn_config *fn);

    /*
    @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev,
    * AFU indexes can be sparse, so a driver should check all indexes up
    * to the maximum found in the function description
    */
    -extern int ocxl_config_check_afu_index(struct pci_dev *dev,
    +int ocxl_config_check_afu_index(struct pci_dev *dev,
    struct ocxl_fn_config *fn, int afu_idx);

    /*
    * Read the configuration space of a function for the AFU specified by
    * the index 'afu_idx'. Fills in a ocxl_afu_config structure
    */
    -extern int ocxl_config_read_afu(struct pci_dev *dev,
    +int ocxl_config_read_afu(struct pci_dev *dev,
    struct ocxl_fn_config *fn,
    struct ocxl_afu_config *afu,
    u8 afu_idx);
    @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev,
    /*
    * Get the max PASID value that can be used by the function
    */
    -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count);
    +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count);

    /*
    * Tell an AFU, by writing in the configuration space, the PASIDs that
    @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count);
    * 'afu_control_offset' is the offset of the AFU control DVSEC which
    * can be found in the function configuration
    */
    -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev,
    +void ocxl_config_set_afu_pasid(struct pci_dev *dev,
    int afu_control_offset,
    int pasid_base, u32 pasid_count_log);

    @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev,
    * 'supported' is the total number of actags desired by all the AFUs
    * of the function.
    */
    -extern int ocxl_config_get_actag_info(struct pci_dev *dev,
    +int ocxl_config_get_actag_info(struct pci_dev *dev,
    u16 *base, u16 *enabled, u16 *supported);

    /*
    @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev,
    * 'func_offset' is the offset of the Function DVSEC that can found in
    * the function configuration
    */
    -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset,
    +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset,
    u32 actag_base, u32 actag_count);

    /*
    @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset,
    * 'afu_control_offset' is the offset of the AFU control DVSEC for the
    * desired AFU. It can be found in the AFU configuration
    */
    -extern void ocxl_config_set_afu_actag(struct pci_dev *dev,
    +void ocxl_config_set_afu_actag(struct pci_dev *dev,
    int afu_control_offset,
    int actag_base, int actag_count);

    @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev,
    * 'afu_control_offset' is the offset of the AFU control DVSEC for the
    * desired AFU. It can be found in the AFU configuration
    */
    -extern void ocxl_config_set_afu_state(struct pci_dev *dev,
    +void ocxl_config_set_afu_state(struct pci_dev *dev,
    int afu_control_offset, int enable);

    /*
    @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev,
    * between the host and device, and set the Transaction Layer on both
    * accordingly.
    */
    -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec);
    +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec);

    /*
    * Request an AFU to terminate a PASID.
    @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec);
    * 'afu_control_offset' is the offset of the AFU control DVSEC for the
    * desired AFU. It can be found in the AFU configuration
    */
    -extern int ocxl_config_terminate_pasid(struct pci_dev *dev,
    +int ocxl_config_terminate_pasid(struct pci_dev *dev,
    int afu_control_offset, int pasid);

    /*
    @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev,
    * Returns a 'link handle' that should be used for further calls for
    * the link
    */
    -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask,
    +int ocxl_link_setup(struct pci_dev *dev, int PE_mask,
    void **link_handle);

    /*
    * Remove the association between the function and its link.
    */
    -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle);
    +void ocxl_link_release(struct pci_dev *dev, void *link_handle);

    /*
    * Add a Process Element to the Shared Process Area for a link.
    @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle);
    * 'xsl_err_data' is an argument passed to the above callback, if
    * defined
    */
    -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
    +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
    u64 amr, struct mm_struct *mm,
    void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr),
    void *xsl_err_data);
    @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr,
    * pasid: the PASID for the AFU context
    * tid: the new thread id for the process element
    */
    -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid);
    +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid);

    /*
    * Remove a Process Element from the Shared Process Area for a link
    */
    -extern int ocxl_link_remove_pe(void *link_handle, int pasid);
    +int ocxl_link_remove_pe(void *link_handle, int pasid);

    /*
    * Allocate an AFU interrupt associated to the link.
    @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid);
    * interrupt. It is an MMIO address which needs to be remapped (one
    * page).
    */
    -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq,
    +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq,
    u64 *obj_handle);

    /*
    * Free a previously allocated AFU interrupt
    */
    -extern void ocxl_link_free_irq(void *link_handle, int hw_irq);
    +void ocxl_link_free_irq(void *link_handle, int hw_irq);

    #endif /* _MISC_OCXL_H_ */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-25 06:36    [W:4.988 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site