svn commit: r347871 - stable/11/sys/dev/mlx5/mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 18:22:02 2019
New Revision: 347871
URL: https://svnweb.freebsd.org/changeset/base/347871

Log:
  MFC r347315:
  Rename functions from mlx5_fwdump to mlx5_ctl in mlx5core.
  
  Submitted by:	kib@
  Sponsored by:	Mellanox Technologies

Modified:
  stable/11/sys/dev/mlx5/mlx5_core/mlx5_core.h
  stable/11/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
  stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/mlx5/mlx5_core/mlx5_core.h
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_core/mlx5_core.h	Thu May 16 18:20:47 2019	(r347870)
+++ stable/11/sys/dev/mlx5/mlx5_core/mlx5_core.h	Thu May 16 18:22:02 2019	(r347871)
@@ -104,8 +104,8 @@ void mlx5e_cleanup(void);
 
 int mlx5_rename_eq(struct mlx5_core_dev *dev, int eq_ix, char *name);
 
-int mlx5_fwdump_init(void);
-void mlx5_fwdump_fini(void);
+int mlx5_ctl_init(void);
+void mlx5_ctl_fini(void);
 void mlx5_fwdump_prep(struct mlx5_core_dev *mdev);
 void mlx5_fwdump(struct mlx5_core_dev *mdev);
 void mlx5_fwdump_clean(struct mlx5_core_dev *mdev);

Modified: stable/11/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c	Thu May 16 18:20:47 2019	(r347870)
+++ stable/11/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c	Thu May 16 18:22:02 2019	(r347871)
@@ -244,7 +244,7 @@ mlx5_fw_reset(struct mlx5_core_dev *mdev)
 }
 
 static int
-mlx5_fwdump_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
+mlx5_ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
     struct thread *td)
 {
 	struct mlx5_core_dev *mdev;
@@ -343,34 +343,34 @@ mlx5_fwdump_ioctl(struct cdev *dev, u_long cmd, caddr_
 	return (error);
 }
 
-static struct cdevsw mlx5_fwdump_devsw = {
+static struct cdevsw mlx5_ctl_devsw = {
 	.d_version =	D_VERSION,
-	.d_ioctl =	mlx5_fwdump_ioctl,
+	.d_ioctl =	mlx5_ctl_ioctl,
 };
 
-static struct cdev *mlx5_fwdump_dev;
+static struct cdev *mlx5_ctl_dev;
 
 int
-mlx5_fwdump_init(void)
+mlx5_ctl_init(void)
 {
 	struct make_dev_args mda;
 	int error;
 
 	make_dev_args_init(&mda);
 	mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME;
-	mda.mda_devsw = &mlx5_fwdump_devsw;
+	mda.mda_devsw = &mlx5_ctl_devsw;
 	mda.mda_uid = UID_ROOT;
 	mda.mda_gid = GID_OPERATOR;
 	mda.mda_mode = 0640;
-	error = make_dev_s(&mda, &mlx5_fwdump_dev, "mlx5ctl");
+	error = make_dev_s(&mda, &mlx5_ctl_dev, "mlx5ctl");
 	return (-error);
 }
 
 void
-mlx5_fwdump_fini(void)
+mlx5_ctl_fini(void)
 {
 
-	if (mlx5_fwdump_dev != NULL)
-		destroy_dev(mlx5_fwdump_dev);
+	if (mlx5_ctl_dev != NULL)
+		destroy_dev(mlx5_ctl_dev);
 
 }

Modified: stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 18:20:47 2019	(r347870)
+++ stable/11/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 18:22:02 2019	(r347871)
@@ -1590,13 +1590,13 @@ static int __init init(void)
 	if (err)
 		goto err_debug;
 
-	err = mlx5_fwdump_init();
+	err = mlx5_ctl_init();
 	if (err)
-		goto err_fwdump;
+		goto err_ctl;
  
  	return 0;
  
-err_fwdump:
+err_ctl:
 	pci_unregister_driver(&mlx5_core_driver);
 
 err_debug:
@@ -1605,7 +1605,7 @@ err_debug:
 
 static void __exit cleanup(void)
 {
-	mlx5_fwdump_fini();
+	mlx5_ctl_fini();
 	pci_unregister_driver(&mlx5_core_driver);
 }