Skip to content

Commit

Permalink
fpga: dfl: revert code formatting differences to upstream
Browse files Browse the repository at this point in the history 
This reverts code formatting differences compared to the upstream
kernel, in preparation of submitting the revised patch series
"fpga: dfl: fix kernel warning on port release/assign for SRIOV".

Signed-off-by: Peter Colberg <peter.colberg@intel.com>
  • Loading branch information
@pcolberg
pcolberg committed Sep 19, 2024
1 parent 8691146 commit 929e0e2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 26 deletions.
11 changes: 3 additions & 8 deletions drivers/fpga/dfl-afu-main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,10 @@ static u8 get_port_rev(struct dfl_feature_dev_data *fdata)

static int port_reset(struct platform_device *pdev)
{
struct dfl_feature_dev_data *fdata;
struct dfl_feature_dev_data *fdata = to_dfl_feature_dev_data(&pdev->dev);
int ret;
u8 rev;

fdata = to_dfl_feature_dev_data(&pdev->dev);

rev = get_port_rev(fdata);

if (rev == 2)
Expand Down Expand Up @@ -548,7 +546,6 @@ static umode_t port_afu_attrs_visible(struct kobject *kobj,
struct dfl_feature_dev_data *fdata;

fdata = to_dfl_feature_dev_data(dev);

/*
* sysfs entries are visible only if related private feature is
* enumerated.
Expand All @@ -570,8 +567,7 @@ __ATTRIBUTE_GROUPS(port_afu);
static int port_afu_init(struct platform_device *pdev,
struct dfl_feature *feature)
{
struct dfl_feature_dev_data *fdata =
to_dfl_feature_dev_data(&pdev->dev);
struct dfl_feature_dev_data *fdata = to_dfl_feature_dev_data(&pdev->dev);
struct resource *res = &pdev->resource[feature->resource_index];
int ret;

Expand Down Expand Up @@ -618,8 +614,7 @@ static const struct dfl_feature_ops port_afu_ops = {
static int port_stp_init(struct platform_device *pdev,
struct dfl_feature *feature)
{
struct dfl_feature_dev_data *fdata =
to_dfl_feature_dev_data(&pdev->dev);
struct dfl_feature_dev_data *fdata = to_dfl_feature_dev_data(&pdev->dev);
struct resource *res = &pdev->resource[feature->resource_index];

return afu_mmio_region_add(fdata,
Expand Down
6 changes: 2 additions & 4 deletions drivers/fpga/dfl-fme-pr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,7 @@ static void dfl_fme_destroy_regions(struct dfl_feature_dev_data *fdata)
static int pr_mgmt_init(struct platform_device *pdev,
struct dfl_feature *feature)
{
struct dfl_feature_dev_data *fdata =
to_dfl_feature_dev_data(&pdev->dev);
struct dfl_feature_dev_data *fdata = to_dfl_feature_dev_data(&pdev->dev);
struct dfl_fme_region *fme_region;
struct dfl_fme_bridge *fme_br;
struct platform_device *mgr;
Expand Down Expand Up @@ -431,8 +430,7 @@ static int pr_mgmt_init(struct platform_device *pdev,
static void pr_mgmt_uinit(struct platform_device *pdev,
struct dfl_feature *feature)
{
struct dfl_feature_dev_data *fdata =
to_dfl_feature_dev_data(&pdev->dev);
struct dfl_feature_dev_data *fdata = to_dfl_feature_dev_data(&pdev->dev);

mutex_lock(&fdata->lock);

Expand Down
11 changes: 3 additions & 8 deletions drivers/fpga/dfl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ static LIST_HEAD(dfl_port_ops_list);
*
* Please note that must dfl_fpga_port_ops_put after use the port_ops.
*/
struct dfl_fpga_port_ops *
dfl_fpga_port_ops_get(struct dfl_feature_dev_data *fdata)
struct dfl_fpga_port_ops *dfl_fpga_port_ops_get(struct dfl_feature_dev_data *fdata)
{
struct dfl_fpga_port_ops *ops = NULL;

Expand Down Expand Up @@ -951,8 +950,7 @@ static int feature_dev_register(struct dfl_feature_dev_data *fdata)
fdata->dev = fdev;

fdev->dev.parent = &fdata->dfl_cdev->region->dev;
fdev->dev.devt = dfl_get_devt(dfl_devs[fdata->type].devt_type,
fdev->id);
fdev->dev.devt = dfl_get_devt(dfl_devs[fdata->type].devt_type, fdev->id);

dfl_fpga_dev_for_each_feature(fdata, feature)
feature->dev = fdev;
Expand Down Expand Up @@ -1834,8 +1832,7 @@ EXPORT_SYMBOL_GPL(dfl_fpga_feature_devs_remove);
*/
struct dfl_feature_dev_data *
__dfl_fpga_cdev_find_port_data(struct dfl_fpga_cdev *cdev, void *data,
int (*match)(struct dfl_feature_dev_data *,
void *))
int (*match)(struct dfl_feature_dev_data *, void *))
{
struct dfl_feature_dev_data *fdata;

Expand Down Expand Up @@ -1902,7 +1899,6 @@ int dfl_fpga_cdev_release_port(struct dfl_fpga_cdev *cdev, int port_id)

feature_dev_unregister(fdata);
cdev->released_port_num++;

unlock_exit:
mutex_unlock(&cdev->lock);
return ret;
Expand Down Expand Up @@ -1945,7 +1941,6 @@ int dfl_fpga_cdev_assign_port(struct dfl_fpga_cdev *cdev, int port_id)
mutex_unlock(&fdata->lock);

cdev->released_port_num--;

unlock_exit:
mutex_unlock(&cdev->lock);
return ret;
Expand Down
9 changes: 3 additions & 6 deletions drivers/fpga/dfl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@ struct dfl_fpga_port_ops {

void dfl_fpga_port_ops_add(struct dfl_fpga_port_ops *ops);
void dfl_fpga_port_ops_del(struct dfl_fpga_port_ops *ops);
struct dfl_fpga_port_ops *
dfl_fpga_port_ops_get(struct dfl_feature_dev_data *fdata);
struct dfl_fpga_port_ops *dfl_fpga_port_ops_get(struct dfl_feature_dev_data *fdata);
void dfl_fpga_port_ops_put(struct dfl_fpga_port_ops *ops);
int dfl_fpga_check_port_id(struct dfl_feature_dev_data *fdata, void *pport_id);

Expand Down Expand Up @@ -598,13 +597,11 @@ void dfl_fpga_feature_devs_remove(struct dfl_fpga_cdev *cdev);

struct dfl_feature_dev_data *
__dfl_fpga_cdev_find_port_data(struct dfl_fpga_cdev *cdev, void *data,
int (*match)(struct dfl_feature_dev_data *,
void *));
int (*match)(struct dfl_feature_dev_data *, void *));

static inline struct dfl_feature_dev_data *
dfl_fpga_cdev_find_port_data(struct dfl_fpga_cdev *cdev, void *data,
int (*match)(struct dfl_feature_dev_data *,
void *))
int (*match)(struct dfl_feature_dev_data *, void *))
{
struct dfl_feature_dev_data *fdata;

Expand Down

0 comments on commit 929e0e2

Please sign in to comment.