module: add per-module param_lock

[karo-tx-linux.git] / drivers / net / ethernet / myricom / myri10ge / myri10ge.c

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 2bae50292dcd814a2b8cb338da1bb0a6beac82f0..83651ac8ddb9d54ca8d7548dc3ca070c29bc5e59 100644 (file)
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -279,7 +279,7 @@ MODULE_FIRMWARE("myri10ge_eth_z8e.dat");
 MODULE_FIRMWARE("myri10ge_rss_ethp_z8e.dat");
 MODULE_FIRMWARE("myri10ge_rss_eth_z8e.dat");
 
-/* Careful: must be accessed under kparam_block_sysfs_write */
+/* Careful: must be accessed under kernel_param_lock() */
 static char *myri10ge_fw_name = NULL;
 module_param(myri10ge_fw_name, charp, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_fw_name, "Firmware image name");
@@ -3427,7 +3427,7 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                }
        }
 
-       kparam_block_sysfs_write(myri10ge_fw_name);
+       kernel_param_lock(THIS_MODULE);
        if (myri10ge_fw_name != NULL) {
                char *fw_name = kstrdup(myri10ge_fw_name, GFP_KERNEL);
                if (fw_name) {
@@ -3435,7 +3435,7 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
                        set_fw_name(mgp, fw_name, true);
                }
        }
-       kparam_unblock_sysfs_write(myri10ge_fw_name);
+       kernel_param_unlock(THIS_MODULE);
 
        if (mgp->board_number < MYRI10GE_MAX_BOARDS &&
            myri10ge_fw_names[mgp->board_number] != NULL &&