Merge branch 'for-6.5/apple' into for-linus

[linux.git] / drivers / fpga / fpga-bridge.c

diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 0953e6e4db041d635a349b4a45fe9714e7343755..a6c25dee9cc11800f47003047dfb449336c0dccb 100644 (file)
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -115,7 +115,7 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)
 /**
  * fpga_bridge_get - get an exclusive reference to an fpga bridge
  * @dev:       parent device that fpga bridge was registered with
 /**
  * fpga_bridge_get - get an exclusive reference to an fpga bridge
  * @dev:       parent device that fpga bridge was registered with

- * @info:      fpga manager info
+ * @info:      fpga image specific information

  *
  * Given a device, get an exclusive reference to an fpga bridge.
  *
  *
  * Given a device, get an exclusive reference to an fpga bridge.
  *


@@ -417,7 +417,7 @@ static void fpga_bridge_dev_release(struct device *dev)
 
 static int __init fpga_bridge_dev_init(void)
 {
 
 static int __init fpga_bridge_dev_init(void)
 {

-       fpga_bridge_class = class_create(THIS_MODULE, "fpga_bridge");
+       fpga_bridge_class = class_create("fpga_bridge");

        if (IS_ERR(fpga_bridge_class))
                return PTR_ERR(fpga_bridge_class);
 
        if (IS_ERR(fpga_bridge_class))
                return PTR_ERR(fpga_bridge_class);