opal: no need to export internal opal_enabled function.

2 files changed, 22 insertions, 28 deletions

diff --git a/lib/luks2/hw_opal/hw_opal.c b/lib/luks2/hw_opal/hw_opal.c
index 27068d20..18d89e6c 100644
--- a/lib/luks2/hw_opal/hw_opal.c
+++ b/lib/luks2/hw_opal/hw_opal.c
@@ -363,6 +363,28 @@ out:
 	return r;
 }
 
+static int opal_query_status(struct crypt_device *cd, struct device *dev, unsigned expected)
+{
+	struct opal_status st = { };
+	int fd, r;
+
+	assert(cd);
+	assert(dev);
+
+	fd = device_open(cd, dev, O_RDONLY);
+	if (fd < 0)
+		return -EIO;
+
+	r = opal_ioctl(cd, fd, IOC_OPAL_GET_STATUS, &st);
+
+	return r < 0 ? -EINVAL : (st.flags & expected) ? 1 : 0;
+}
+
+static int opal_enabled(struct crypt_device *cd, struct device *dev)
+{
+	return opal_query_status(cd, dev, OPAL_FL_LOCKING_ENABLED);
+}
+
 int opal_setup_ranges(struct crypt_device *cd,
 		      struct device *dev,
 		      const struct volume_key *vk,
@@ -855,33 +877,11 @@ out:
 	return r;
 }
 
-static int opal_query_status(struct crypt_device *cd, struct device *dev, unsigned expected)
-{
-	struct opal_status st = { };
-	int fd, r;
-
-	assert(cd);
-	assert(dev);
-
-	fd = device_open(cd, dev, O_RDONLY);
-	if (fd < 0)
-		return -EIO;
-
-	r = opal_ioctl(cd, fd, IOC_OPAL_GET_STATUS, &st);
-
-	return r < 0 ? -EINVAL : (st.flags & expected) ? 1 : 0;
-}
-
 int opal_supported(struct crypt_device *cd, struct device *dev)
 {
 	return opal_query_status(cd, dev, OPAL_FL_SUPPORTED|OPAL_FL_LOCKING_SUPPORTED);
 }
 
-int opal_enabled(struct crypt_device *cd, struct device *dev)
-{
-	return opal_query_status(cd, dev, OPAL_FL_LOCKING_ENABLED);
-}
-
 int opal_geometry(struct crypt_device *cd,
 		  struct device *dev,
 		  bool *ret_align,
@@ -959,11 +959,6 @@ int opal_supported(struct crypt_device *cd, struct device *dev)
 	return -ENOTSUP;
 }
 
-int opal_enabled(struct crypt_device *cd, struct device *dev)
-{
-	return -ENOTSUP;
-}
-
 int opal_factory_reset(struct crypt_device *cd,
 		       struct device *dev,
 		       const char *password,
diff --git a/lib/luks2/hw_opal/hw_opal.h b/lib/luks2/hw_opal/hw_opal.h
index d4701600..c13dd368 100644
--- a/lib/luks2/hw_opal/hw_opal.h
+++ b/lib/luks2/hw_opal/hw_opal.h
@@ -38,7 +38,6 @@ int opal_unlock(struct crypt_device *cd,
 		uint32_t segment_number,
 		const struct volume_key *vk);
 int opal_supported(struct crypt_device *cd, struct device *dev);
-int opal_enabled(struct crypt_device *cd, struct device *dev);
 int opal_factory_reset(struct crypt_device *cd,
 		       struct device *dev,
 		       const char *password,