4 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 2bae50292dcd..83651ac8ddb9 100644
--- 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 &&
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 1a20cee5febe..799a2efe5793 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -821,15 +821,15 @@ static int if_usb_prog_firmware(struct if_usb_card *cardp)
 
         lbtf_deb_enter(LBTF_DEB_USB);
 
-        kparam_block_sysfs_write(fw_name);
+        kernel_param_lock(THIS_MODULE);
         ret = request_firmware(&cardp->fw, lbtf_fw_name, &cardp->udev->dev);
         if (ret < 0) {
                 pr_err("request_firmware() failed with %#x\n", ret);
                 pr_err("firmware %s not found\n", lbtf_fw_name);
-                kparam_unblock_sysfs_write(fw_name);
+                kernel_param_unlock(THIS_MODULE);
                 goto done;
         }
-        kparam_unblock_sysfs_write(fw_name);
+        kernel_param_unlock(THIS_MODULE);
 
         if (check_fwfile_format(cardp->fw->data, cardp->fw->size))
                 goto release_fw;
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 888998a7fe31..a2ae88dbda78 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -1599,7 +1599,7 @@ static void cmvs_file_name(struct uea_softc *sc, char *const cmv_name, int ver)
         char file_arr[] = "CMVxy.bin";
         char *file;
 
-        kparam_block_sysfs_write(cmv_file);
+        kernel_param_lock(THIS_MODULE);
         /* set proper name corresponding modem version and line type */
         if (cmv_file[sc->modem_index] == NULL) {
                 if (UEA_CHIP_VERSION(sc) == ADI930)
@@ -1618,7 +1618,7 @@ static void cmvs_file_name(struct uea_softc *sc, char *const cmv_name, int ver)
         strlcat(cmv_name, file, UEA_FW_NAME_MAX);
         if (ver == 2)
                 strlcat(cmv_name, ".v2", UEA_FW_NAME_MAX);
-        kparam_unblock_sysfs_write(cmv_file);
+        kernel_param_unlock(THIS_MODULE);
 }
 
 static int request_cmvs_old(struct uea_softc *sc,
diff --git a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c
index ea7f056ed5fe..8bac309c24b9 100644
--- a/drivers/video/fbdev/vt8623fb.c
+++ b/drivers/video/fbdev/vt8623fb.c
@@ -754,9 +754,9 @@ static int vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
         /* Prepare startup mode */
 
-        kparam_block_sysfs_write(mode_option);
+        kernel_param_lock(THIS_MODULE);
         rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
-        kparam_unblock_sysfs_write(mode_option);
+        kernel_param_unlock(THIS_MODULE);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
                 dev_err(info->device, "mode %s not found\n", mode_option);