| Message ID | 20220423170235.2115479-3-nava.manne@xilinx.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fpga: fix for coding style and kernel-doc issues | expand |
On Sat, Apr 23, 2022 at 10:32:32PM +0530, Nava kishore Manne wrote: > fixes the below checks reported by checkpatch.pl: > - Lines should not end with a '(' > - Alignment should match open parenthesis > > Signed-off-by: Nava kishore Manne <nava.manne@xilinx.com> Acked-by: Xu Yilun <yilun.xu@intel.com> > --- > Changes for v2: > -None. > Changes for v3: > -Fixed similar issue exists in "drivers/fpga/*". > Changes for v4: > -None. > Changes for v5: > - Reduced the length of the 'fpga_mgr_write_init(...)' API > as suggested by Joe. > - To align Include declaration and definition of APIs updated > the FPGA-region.h file as suggested by joe. > - Fixed similar issue exists with of_fpga_region_parse_ov() API. > > Changes for v6: > - Align the declaration and definition of APIs as suggested by > Yilun and Joe. > - Move the 'count' handling logic into 'else' block as suggested > by Yilun. > > drivers/fpga/fpga-mgr.c | 9 +++++---- > drivers/fpga/fpga-region.c | 6 +++--- > drivers/fpga/of-fpga-region.c | 6 +++--- > include/linux/fpga/fpga-region.h | 6 +++--- > 4 files changed, 14 insertions(+), 13 deletions(-) > > diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c > index d49a9ce34568..24dee27c7897 100644 > --- a/drivers/fpga/fpga-mgr.c > +++ b/drivers/fpga/fpga-mgr.c > @@ -148,11 +148,12 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr, > int ret; > > mgr->state = FPGA_MGR_STATE_WRITE_INIT; > - if (!mgr->mops->initial_header_size) > + if (!mgr->mops->initial_header_size) { > ret = fpga_mgr_write_init(mgr, info, NULL, 0); > - else > - ret = fpga_mgr_write_init( > - mgr, info, buf, min(mgr->mops->initial_header_size, count)); > + } else { > + count = min(mgr->mops->initial_header_size, count); > + ret = fpga_mgr_write_init(mgr, info, buf, count); > + } > > if (ret) { > dev_err(&mgr->dev, "Error preparing FPGA for writing\n"); > diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c > index b0ac18de4885..485948e3c0db 100644 > --- a/drivers/fpga/fpga-region.c > +++ b/drivers/fpga/fpga-region.c > @@ -18,9 +18,9 @@ > static DEFINE_IDA(fpga_region_ida); > static struct class *fpga_region_class; > > -struct fpga_region *fpga_region_class_find( > - struct device *start, const void *data, > - int (*match)(struct device *, const void *)) > +struct fpga_region * > +fpga_region_class_find(struct device *start, const void *data, > + int (*match)(struct device *, const void *)) > { > struct device *dev; > > diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c > index 50b83057c048..a598d03626af 100644 > --- a/drivers/fpga/of-fpga-region.c > +++ b/drivers/fpga/of-fpga-region.c > @@ -189,9 +189,9 @@ static int child_regions_with_firmware(struct device_node *overlay) > * fpga_image_info struct if there is an image to program. > * error code for invalid overlay. > */ > -static struct fpga_image_info *of_fpga_region_parse_ov( > - struct fpga_region *region, > - struct device_node *overlay) > +static struct fpga_image_info * > +of_fpga_region_parse_ov(struct fpga_region *region, > + struct device_node *overlay) > { > struct device *dev = ®ion->dev; > struct fpga_image_info *info; > diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h > index 3b87f232425c..9d4d32909340 100644 > --- a/include/linux/fpga/fpga-region.h > +++ b/include/linux/fpga/fpga-region.h > @@ -52,9 +52,9 @@ struct fpga_region { > > #define to_fpga_region(d) container_of(d, struct fpga_region, dev) > > -struct fpga_region *fpga_region_class_find( > - struct device *start, const void *data, > - int (*match)(struct device *, const void *)); > +struct fpga_region * > +fpga_region_class_find(struct device *start, const void *data, > + int (*match)(struct device *, const void *)); > > int fpga_region_program_fpga(struct fpga_region *region); > > -- > 2.25.1
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index d49a9ce34568..24dee27c7897 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -148,11 +148,12 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr, int ret; mgr->state = FPGA_MGR_STATE_WRITE_INIT; - if (!mgr->mops->initial_header_size) + if (!mgr->mops->initial_header_size) { ret = fpga_mgr_write_init(mgr, info, NULL, 0); - else - ret = fpga_mgr_write_init( - mgr, info, buf, min(mgr->mops->initial_header_size, count)); + } else { + count = min(mgr->mops->initial_header_size, count); + ret = fpga_mgr_write_init(mgr, info, buf, count); + } if (ret) { dev_err(&mgr->dev, "Error preparing FPGA for writing\n"); diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c index b0ac18de4885..485948e3c0db 100644 --- a/drivers/fpga/fpga-region.c +++ b/drivers/fpga/fpga-region.c @@ -18,9 +18,9 @@ static DEFINE_IDA(fpga_region_ida); static struct class *fpga_region_class; -struct fpga_region *fpga_region_class_find( - struct device *start, const void *data, - int (*match)(struct device *, const void *)) +struct fpga_region * +fpga_region_class_find(struct device *start, const void *data, + int (*match)(struct device *, const void *)) { struct device *dev; diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 50b83057c048..a598d03626af 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c @@ -189,9 +189,9 @@ static int child_regions_with_firmware(struct device_node *overlay) * fpga_image_info struct if there is an image to program. * error code for invalid overlay. */ -static struct fpga_image_info *of_fpga_region_parse_ov( - struct fpga_region *region, - struct device_node *overlay) +static struct fpga_image_info * +of_fpga_region_parse_ov(struct fpga_region *region, + struct device_node *overlay) { struct device *dev = ®ion->dev; struct fpga_image_info *info; diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h index 3b87f232425c..9d4d32909340 100644 --- a/include/linux/fpga/fpga-region.h +++ b/include/linux/fpga/fpga-region.h @@ -52,9 +52,9 @@ struct fpga_region { #define to_fpga_region(d) container_of(d, struct fpga_region, dev) -struct fpga_region *fpga_region_class_find( - struct device *start, const void *data, - int (*match)(struct device *, const void *)); +struct fpga_region * +fpga_region_class_find(struct device *start, const void *data, + int (*match)(struct device *, const void *)); int fpga_region_program_fpga(struct fpga_region *region);
fixes the below checks reported by checkpatch.pl: - Lines should not end with a '(' - Alignment should match open parenthesis Signed-off-by: Nava kishore Manne <nava.manne@xilinx.com> --- Changes for v2: -None. Changes for v3: -Fixed similar issue exists in "drivers/fpga/*". Changes for v4: -None. Changes for v5: - Reduced the length of the 'fpga_mgr_write_init(...)' API as suggested by Joe. - To align Include declaration and definition of APIs updated the FPGA-region.h file as suggested by joe. - Fixed similar issue exists with of_fpga_region_parse_ov() API. Changes for v6: - Align the declaration and definition of APIs as suggested by Yilun and Joe. - Move the 'count' handling logic into 'else' block as suggested by Yilun. drivers/fpga/fpga-mgr.c | 9 +++++---- drivers/fpga/fpga-region.c | 6 +++--- drivers/fpga/of-fpga-region.c | 6 +++--- include/linux/fpga/fpga-region.h | 6 +++--- 4 files changed, 14 insertions(+), 13 deletions(-)