Commit 1fb1ea0d authored Mar 10, 2023 by Andy Shevchenko Committed by Greg Kroah-Hartman Mar 23, 2023

mei: Move uuid.h to the MEI namespace



There is only a single user of the UUID uAPI, let's make it
part of that user.

The way it's done is to prevent compilation time breakage for
the user space that does

	#include <linux/uuid.h>

In the future MEI user space tools can switch over to use mei_uuid.h.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230310170747.22782-1-andriy.shevchenko@linux.intel.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent abae2626

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -10459,6 +10459,7 @@ F: drivers/watchdog/mei_wdt.c
		F: include/linux/mei_aux.h
		F: include/linux/mei_cl_bus.h
		F: include/uapi/linux/mei.h
		F: include/uapi/linux/mei_uuid.h
		F: include/uapi/linux/uuid.h
		F: samples/mei/*

drivers/misc/mei/bus-fixup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@
		#include <linux/module.h>
		#include <linux/device.h>
		#include <linux/slab.h>
		#include <linux/uuid.h>

		#include <linux/mei.h>
		#include <linux/mei_cl_bus.h>

		#include "mei_dev.h"

drivers/misc/mei/hdcp/mei_hdcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		#include <linux/module.h>
		#include <linux/slab.h>
		#include <linux/uuid.h>
		#include <linux/mei.h>
		#include <linux/mei_cl_bus.h>
		#include <linux/component.h>
		#include <drm/drm_connector.h>

drivers/misc/mei/hw.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		#ifndef _MEI_HW_TYPES_H_
		#define _MEI_HW_TYPES_H_

		#include <linux/uuid.h>
		#include <linux/mei.h>

		/*
		* Timeouts in Seconds

drivers/misc/mei/main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#include <linux/ioctl.h>
		#include <linux/cdev.h>
		#include <linux/sched/signal.h>
		#include <linux/uuid.h>
		#include <linux/compat.h>
		#include <linux/jiffies.h>
		#include <linux/interrupt.h>