fpga: dfl: convert features from flexible array member to separate array

Use a separate array allocation for features and substitute a pointer
for the flexible array member in the feature device data. A subsequent
commit will add another array for resources. The current commit converts
the flexible array member to a separate allocation for consistency.

Signed-off-by: Peter Colberg <peter.colberg@intel.com>
Reviewed-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Reviewed-by: Basheer Ahmed Muddebihal <basheer.ahmed.muddebihal@linux.intel.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20241120011035.230574-12-peter.colberg@intel.com
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>

diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 1d1f2330beef2257ce7d6d56a1ccff2d701372fd..3015dfc1d552ad7c54d7be07813f1ecc389692c9 100644 (file)
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -752,10 +752,15 @@ binfo_create_feature_dev_data(struct build_feature_devs_info *binfo)
        if (WARN_ON_ONCE(type >= DFL_ID_MAX))
                return ERR_PTR(-EINVAL);
 
-       fdata = devm_kzalloc(binfo->dev, struct_size(fdata, features, binfo->feature_num), GFP_KERNEL);
+       fdata = devm_kzalloc(binfo->dev, sizeof(*fdata), GFP_KERNEL);
        if (!fdata)
                return ERR_PTR(-ENOMEM);
 
+       fdata->features = devm_kcalloc(binfo->dev, binfo->feature_num,
+                                      sizeof(*fdata->features), GFP_KERNEL);
+       if (!fdata->features)
+               return ERR_PTR(-ENOMEM);
+
        fdata->dev = fdev;
        fdata->type = type;
        fdata->num = binfo->feature_num;

diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index bcbdfcdb974207e38e23fe69ef979deb59e3eb81..d2765555e10939fc03d8d1f7ccdee92deec8b96e 100644 (file)
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -330,7 +330,7 @@ struct dfl_feature_dev_data {
        int open_count;
        void *private;
        int num;
-       struct dfl_feature features[];
+       struct dfl_feature *features;
 };
 
 /**