lkml.org 
[lkml]   [2024]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 7/9] fpga: dfl: migrate DFL support header to dfl_feature_dev_data
    Date
    This change separates out most of the symbol name changes required by this
    patch series for the file: drivers/fpga/dfl.h. This is done to split a
    single monolithic change into multiple, smaller patches at the request of
    the maintainer.

    Signed-off-by: Peter Colberg <peter.colberg@intel.com>
    ---
    v2:
    - Split monolithic patch into series at request of maintainer
    ---
    drivers/fpga/dfl.h | 46 ++++++++++++++++++++--------------------------
    1 file changed, 20 insertions(+), 26 deletions(-)

    diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
    index d724614796cb..b700f5bb7be7 100644
    --- a/drivers/fpga/dfl.h
    +++ b/drivers/fpga/dfl.h
    @@ -333,55 +333,51 @@ struct dfl_feature_platform_data {
    };

    static inline
    -int dfl_feature_dev_use_begin(struct dfl_feature_platform_data *pdata,
    +int dfl_feature_dev_use_begin(struct dfl_feature_dev_data *fdata,
    bool excl)
    {
    - if (pdata->excl_open)
    + if (fdata->excl_open)
    return -EBUSY;

    if (excl) {
    - if (pdata->open_count)
    + if (fdata->open_count)
    return -EBUSY;

    - pdata->excl_open = true;
    + fdata->excl_open = true;
    }
    - pdata->open_count++;
    + fdata->open_count++;

    return 0;
    }

    static inline
    -void dfl_feature_dev_use_end(struct dfl_feature_platform_data *pdata)
    +void dfl_feature_dev_use_end(struct dfl_feature_dev_data *fdata)
    {
    - pdata->excl_open = false;
    + fdata->excl_open = false;

    - if (WARN_ON(pdata->open_count <= 0))
    + if (WARN_ON(fdata->open_count <= 0))
    return;

    - pdata->open_count--;
    + fdata->open_count--;
    }

    static inline
    -int dfl_feature_dev_use_count(struct dfl_feature_platform_data *pdata)
    +int dfl_feature_dev_use_count(struct dfl_feature_dev_data *fdata)
    {
    - return pdata->open_count;
    + return fdata->open_count;
    }

    -#define dfl_fpga_fdata_set_private dfl_fpga_pdata_set_private
    -
    static inline
    -void dfl_fpga_pdata_set_private(struct dfl_feature_platform_data *pdata,
    +void dfl_fpga_fdata_set_private(struct dfl_feature_dev_data *fdata,
    void *private)
    {
    - pdata->private = private;
    + fdata->private = private;
    }

    -#define dfl_fpga_fdata_get_private dfl_fpga_pdata_get_private
    -
    static inline
    -void *dfl_fpga_pdata_get_private(struct dfl_feature_platform_data *pdata)
    +void *dfl_fpga_fdata_get_private(struct dfl_feature_dev_data *fdata)
    {
    - return pdata->private;
    + return fdata->private;
    }

    struct dfl_feature_ops {
    @@ -414,9 +410,9 @@ struct platform_device *dfl_fpga_inode_to_feature_dev(struct inode *inode)
    return pdata->dev;
    }

    -#define dfl_fpga_dev_for_each_feature(pdata, feature) \
    - for ((feature) = (pdata)->features; \
    - (feature) < (pdata)->features + (pdata)->num; (feature)++)
    +#define dfl_fpga_dev_for_each_feature(fdata, feature) \
    + for ((feature) = (fdata)->features; \
    + (feature) < (fdata)->features + (fdata)->num; (feature)++)

    static inline
    struct dfl_feature *dfl_get_feature_by_id(struct device *dev, u16 id)
    @@ -445,12 +441,10 @@ void __iomem *dfl_get_feature_ioaddr_by_id(struct device *dev, u16 id)

    #define to_dfl_feature_dev_data dev_get_platdata

    -#define dfl_fpga_fdata_to_parent dfl_fpga_pdata_to_parent
    -
    static inline
    -struct device *dfl_fpga_pdata_to_parent(struct dfl_feature_platform_data *pdata)
    +struct device *dfl_fpga_fdata_to_parent(struct dfl_feature_dev_data *fdata)
    {
    - return pdata->dev->dev.parent->parent;
    + return fdata->dev->dev.parent->parent;
    }

    static inline bool dfl_feature_is_fme(void __iomem *base)
    --
    2.44.0

    \
     
     \ /
      Last update: 2024-05-27 16:31    [W:7.244 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site