| Message ID | 20180327195957.3878-5-atull@kernel.org (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
Hi Alan, On Tue, Mar 27, 2018 at 12:59 PM, Alan Tull <atull@kernel.org> wrote: > Change fpga_region_register to only take one parameter: > > int fpga_region_register(struct fpga_region *region) > > The parent dev is added to struct fpga_region. > > This make it similar to fpga_bridge_register and fpga_mgr_register > which also just take their respective struct. > > The one caller of fpga_region_register is changed to alloc the > fpga_region struct, fill it in, and pass it to the register > function. > > Signed-off-by: Alan Tull <atull@kernel.org> Acked-by: Moritz Fischer <mdf@kernel.org> > --- > v2: This patch added in this version of the patchset > v3: minor changes to make diffs smaller and more obviously correct > --- > Documentation/fpga/fpga-region.txt | 3 +-- > drivers/fpga/fpga-region.c | 8 +++++++- > drivers/fpga/of-fpga-region.c | 3 ++- > include/linux/fpga/fpga-region.h | 4 +++- > 4 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/Documentation/fpga/fpga-region.txt b/Documentation/fpga/fpga-region.txt > index 139a02ba1ff6..d38fa3b4154a 100644 > --- a/Documentation/fpga/fpga-region.txt > +++ b/Documentation/fpga/fpga-region.txt > @@ -42,8 +42,7 @@ The FPGA region API > To register or unregister a region: > ----------------------------------- > > - int fpga_region_register(struct device *dev, > - struct fpga_region *region); > + int fpga_region_register(struct fpga_region *region); > int fpga_region_unregister(struct fpga_region *region); > > An example of usage can be seen in the probe function of [3] > diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c > index ebe1f872810d..660a91b9e246 100644 > --- a/drivers/fpga/fpga-region.c > +++ b/drivers/fpga/fpga-region.c > @@ -162,10 +162,16 @@ int fpga_region_program_fpga(struct fpga_region *region) > } > EXPORT_SYMBOL_GPL(fpga_region_program_fpga); > > -int fpga_region_register(struct device *dev, struct fpga_region *region) > +int fpga_region_register(struct fpga_region *region) > { > + struct device *dev = region->parent; > int id, ret = 0; > > + if (!dev) { > + pr_err("Attempt to register fpga region without parent\n"); > + return -EINVAL; > + } > + > id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL); > if (id < 0) > return id; > diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c > index 35e7e8c4a0cb..a7b38aafeaa7 100644 > --- a/drivers/fpga/of-fpga-region.c > +++ b/drivers/fpga/of-fpga-region.c > @@ -428,12 +428,13 @@ static int of_fpga_region_probe(struct platform_device *pdev) > goto eprobe_mgr_put; > } > > + region->parent = dev; > region->mgr = mgr; > > /* Specify how to get bridges for this type of region. */ > region->get_bridges = of_fpga_region_get_bridges; > > - ret = fpga_region_register(dev, region); > + ret = fpga_region_register(region); > if (ret) > goto eprobe_mgr_put; > > diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h > index b6520318ab9c..423c87e3e29a 100644 > --- a/include/linux/fpga/fpga-region.h > +++ b/include/linux/fpga/fpga-region.h > @@ -8,6 +8,7 @@ > /** > * struct fpga_region - FPGA Region structure > * @dev: FPGA Region device > + * @parent: parent device > * @mutex: enforces exclusive reference to region > * @bridge_list: list of FPGA bridges specified in region > * @mgr: FPGA manager > @@ -18,6 +19,7 @@ > */ > struct fpga_region { > struct device dev; > + struct device *parent; > struct mutex mutex; /* for exclusive reference to region */ > struct list_head bridge_list; > struct fpga_manager *mgr; > @@ -34,7 +36,7 @@ struct fpga_region *fpga_region_class_find( > int (*match)(struct device *, const void *)); > > int fpga_region_program_fpga(struct fpga_region *region); > -int fpga_region_register(struct device *dev, struct fpga_region *region); > +int fpga_region_register(struct fpga_region *region); > int fpga_region_unregister(struct fpga_region *region); > > #endif /* _FPGA_REGION_H */ > -- > 2.14.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fpga" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Thanks, Moritz -- To unsubscribe from this list: send the line "unsubscribe linux-fpga" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/fpga/fpga-region.txt b/Documentation/fpga/fpga-region.txt index 139a02ba1ff6..d38fa3b4154a 100644 --- a/Documentation/fpga/fpga-region.txt +++ b/Documentation/fpga/fpga-region.txt @@ -42,8 +42,7 @@ The FPGA region API To register or unregister a region: ----------------------------------- - int fpga_region_register(struct device *dev, - struct fpga_region *region); + int fpga_region_register(struct fpga_region *region); int fpga_region_unregister(struct fpga_region *region); An example of usage can be seen in the probe function of [3] diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c index ebe1f872810d..660a91b9e246 100644 --- a/drivers/fpga/fpga-region.c +++ b/drivers/fpga/fpga-region.c @@ -162,10 +162,16 @@ int fpga_region_program_fpga(struct fpga_region *region) } EXPORT_SYMBOL_GPL(fpga_region_program_fpga); -int fpga_region_register(struct device *dev, struct fpga_region *region) +int fpga_region_register(struct fpga_region *region) { + struct device *dev = region->parent; int id, ret = 0; + if (!dev) { + pr_err("Attempt to register fpga region without parent\n"); + return -EINVAL; + } + id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL); if (id < 0) return id; diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 35e7e8c4a0cb..a7b38aafeaa7 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c @@ -428,12 +428,13 @@ static int of_fpga_region_probe(struct platform_device *pdev) goto eprobe_mgr_put; } + region->parent = dev; region->mgr = mgr; /* Specify how to get bridges for this type of region. */ region->get_bridges = of_fpga_region_get_bridges; - ret = fpga_region_register(dev, region); + ret = fpga_region_register(region); if (ret) goto eprobe_mgr_put; diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h index b6520318ab9c..423c87e3e29a 100644 --- a/include/linux/fpga/fpga-region.h +++ b/include/linux/fpga/fpga-region.h @@ -8,6 +8,7 @@ /** * struct fpga_region - FPGA Region structure * @dev: FPGA Region device + * @parent: parent device * @mutex: enforces exclusive reference to region * @bridge_list: list of FPGA bridges specified in region * @mgr: FPGA manager @@ -18,6 +19,7 @@ */ struct fpga_region { struct device dev; + struct device *parent; struct mutex mutex; /* for exclusive reference to region */ struct list_head bridge_list; struct fpga_manager *mgr; @@ -34,7 +36,7 @@ struct fpga_region *fpga_region_class_find( int (*match)(struct device *, const void *)); int fpga_region_program_fpga(struct fpga_region *region); -int fpga_region_register(struct device *dev, struct fpga_region *region); +int fpga_region_register(struct fpga_region *region); int fpga_region_unregister(struct fpga_region *region); #endif /* _FPGA_REGION_H */
Change fpga_region_register to only take one parameter: int fpga_region_register(struct fpga_region *region) The parent dev is added to struct fpga_region. This make it similar to fpga_bridge_register and fpga_mgr_register which also just take their respective struct. The one caller of fpga_region_register is changed to alloc the fpga_region struct, fill it in, and pass it to the register function. Signed-off-by: Alan Tull <atull@kernel.org> --- v2: This patch added in this version of the patchset v3: minor changes to make diffs smaller and more obviously correct --- Documentation/fpga/fpga-region.txt | 3 +-- drivers/fpga/fpga-region.c | 8 +++++++- drivers/fpga/of-fpga-region.c | 3 ++- include/linux/fpga/fpga-region.h | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-)