fpga: add attribute groups

Make it easy to add attributes to low level FPGA drivers the right
way.  Add attribute groups pointers to structures that are used when
registering a manager, bridge, or group.  When the low level driver
registers, set the device attribute group.  The attributes are
created in device_add.

Signed-off-by: Alan Tull <atull@kernel.org>
Acked-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 0dfe9d78cee214f8d73a9749039a4158c42da279..e693c3607a14941c1c123e5b39e96a913484df1d 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -367,6 +367,7 @@ int fpga_bridge_register(struct device *dev, const char *name,
        bridge->priv = priv;
 
        device_initialize(&bridge->dev);
+       bridge->dev.groups = br_ops->groups;
        bridge->dev.class = fpga_bridge_class;
        bridge->dev.parent = dev;
        bridge->dev.of_node = dev->of_node;

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index d27e8d2a149cb89fd9f44cb8aa5634ac56d1415e..223f2401939bc7b13601e8a6ec2b03e7866b3ba9 100644 (file)
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -569,6 +569,7 @@ int fpga_mgr_register(struct device *dev, const char *name,
 
        device_initialize(&mgr->dev);
        mgr->dev.class = fpga_mgr_class;
+       mgr->dev.groups = mops->groups;
        mgr->dev.parent = dev;
        mgr->dev.of_node = dev->of_node;
        mgr->dev.id = id;

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index afc61885a601d67377ea438adefc9b9f296ebded..edab2a2e03ef883c9bb11b73c39fa9dc476b1329 100644 (file)
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -173,6 +173,7 @@ int fpga_region_register(struct device *dev, struct fpga_region *region)
        mutex_init(&region->mutex);
        INIT_LIST_HEAD(&region->bridge_list);
        device_initialize(&region->dev);
+       region->dev.groups = region->groups;
        region->dev.class = fpga_region_class;
        region->dev.parent = dev;
        region->dev.of_node = dev->of_node;

diff --git a/include/linux/fpga/fpga-bridge.h b/include/linux/fpga/fpga-bridge.h
index 6ca41f8f949fbaa883ee2bf06190fd6b4a9f8a3a..3694821a6d2d14be2f4abc301f3ea4857776690c 100644 (file)
--- a/include/linux/fpga/fpga-bridge.h
+++ b/include/linux/fpga/fpga-bridge.h
@@ -13,11 +13,13 @@ struct fpga_bridge;
  * @enable_show: returns the FPGA bridge's status
  * @enable_set: set a FPGA bridge as enabled or disabled
  * @fpga_bridge_remove: set FPGA into a specific state during driver remove
+ * @groups: optional attribute groups.
  */
 struct fpga_bridge_ops {
        int (*enable_show)(struct fpga_bridge *bridge);
        int (*enable_set)(struct fpga_bridge *bridge, bool enable);
        void (*fpga_bridge_remove)(struct fpga_bridge *bridge);
+       const struct attribute_group **groups;
 };
 
 /**

diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
index 4fb706bd9abaa6f26890fb2c62a38ee9f3aa3e2e..3c6de23aabdfd27e471dbcf4ba679a297152990d 100644 (file)
--- a/include/linux/fpga/fpga-mgr.h
+++ b/include/linux/fpga/fpga-mgr.h
@@ -115,6 +115,7 @@ struct fpga_image_info {
  * @write_sg: write the scatter list of configuration data to the FPGA
  * @write_complete: set FPGA to operating state after writing is done
  * @fpga_remove: optional: Set FPGA into a specific state during driver remove
+ * @groups: optional attribute groups.
  *
  * fpga_manager_ops are the low level functions implemented by a specific
  * fpga manager driver.  The optional ones are tested for NULL before being
@@ -131,6 +132,7 @@ struct fpga_manager_ops {
        int (*write_complete)(struct fpga_manager *mgr,
                              struct fpga_image_info *info);
        void (*fpga_remove)(struct fpga_manager *mgr);
+       const struct attribute_group **groups;
 };
 
 /**

diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h
index 7048449446316e4b2bffaa6ee8c559fdf6f409a6..b6520318ab9c602aace6eafb325d056f7f90c49f 100644 (file)
--- a/include/linux/fpga/fpga-region.h
+++ b/include/linux/fpga/fpga-region.h
@@ -14,6 +14,7 @@
  * @info: FPGA image info
  * @priv: private data
  * @get_bridges: optional function to get bridges to a list
+ * @groups: optional attribute groups.
  */
 struct fpga_region {
        struct device dev;
@@ -23,6 +24,7 @@ struct fpga_region {
        struct fpga_image_info *info;
        void *priv;
        int (*get_bridges)(struct fpga_region *region);
+       const struct attribute_group **groups;
 };
 
 #define to_fpga_region(d) container_of(d, struct fpga_region, dev)