[v1] modpost: file2alias: Kill the old UUID type

Commit Message

Andy Shevchenko April 22, 2020, 2:10 p.m. UTC

There is dangling old UUID type, i.e. uuid_le, which is defined in the same way
as new ones, so, we may safely drop it. There is no ABI change!

Signed-off-by: Andy Shevchenko <[e-mail]>
---
 include/linux/mod_devicetable.h | 4 ++--
 scripts/mod/file2alias.c        | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

Comments

Andy Shevchenko April 23, 2020, 12:47 p.m. UTC | #1

On Wed, Apr 22, 2020 at 05:10:34PM +0300, Andy Shevchenko wrote:
> There is dangling old UUID type, i.e. uuid_le, which is defined in the same way
> as new ones, so, we may safely drop it. There is no ABI change!

Unfortunately it can't be done like this.
Needs a bit more preparations first.

Sorry for the noise.

Patch

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 4b3d0a4945dfc..f4e543335c307 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -434,7 +434,7 @@  struct virtio_device_id {
  * For Hyper-V devices we use the device guid as the id.
  */
 struct hv_vmbus_device_id {
-	uuid_le guid;
+	guid_t guid;
 	kernel_ulong_t driver_data;	/* Data private to the driver */
 };
 
@@ -707,7 +707,7 @@  struct ipack_device_id {
  */
 struct mei_cl_device_id {
 	char name[MEI_CL_NAME_SIZE];
-	uuid_le uuid;
+	guid_t uuid;
 	__u8    version;
 	kernel_ulong_t driver_info;
 };
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 9599e2a3f1e61..0a42d3bfdfe53 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -34,17 +34,15 @@  typedef Elf64_Addr	kernel_ulong_t;
 typedef uint32_t	__u32;
 typedef uint16_t	__u16;
 typedef unsigned char	__u8;
+
 typedef struct {
 	__u8 b[16];
 } guid_t;
 
-/* backwards compatibility, don't use in new code */
-typedef struct {
-	__u8 b[16];
-} uuid_le;
 typedef struct {
 	__u8 b[16];
 } uuid_t;
+
 #define	UUID_STRING_LEN		36
 
 /* Big exception to the "don't include kernel headers into userspace, which
@@ -104,7 +102,7 @@  static inline void add_wildcard(char *str)
 		strcat(str + len, "*");
 }
 
-static inline void add_uuid(char *str, uuid_le uuid)
+static inline void add_uuid(char *str, guid_t uuid)
 {
 	int len = strlen(str);