From: Dave Penkler <dpenkler@gmail.com>
To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org
Cc: Dave Penkler <dpenkler@gmail.com>
Subject: [PATCH 2/2] staging: gpib: Rename common include file
Date: Fri, 18 Apr 2025 11:31:11 +0200 [thread overview]
Message-ID: <20250418093111.8820-3-dpenkler@gmail.com> (raw)
In-Reply-To: <20250418093111.8820-1-dpenkler@gmail.com>
User code includes gpib_user.h. Since this include has diverged
from the original by
- removing unused functions and defines
- changing camel-case identifiers
- removing typedefs
we need to change the name of the kernel include. This include
will be included in the userland gpib_user.h ensuring backward
compatibility for application programmes.
Rename the file and change the references to it.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/include/gpibP.h | 2 +-
drivers/staging/gpib/include/gpib_types.h | 2 +-
drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} (100%)
diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/include/gpibP.h
index 6461b330a3c3..0af72934ce24 100644
--- a/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/staging/gpib/include/gpibP.h
@@ -11,7 +11,7 @@
#include "gpib_types.h"
#include "gpib_proto.h"
-#include "gpib_user.h"
+#include "gpib.h"
#include "gpib_ioctl.h"
#include <linux/fs.h>
diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/staging/gpib/include/gpib_types.h
index 9e0dfdb9904d..2af4574d400c 100644
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/staging/gpib/include/gpib_types.h
@@ -8,7 +8,7 @@
#define _GPIB_TYPES_H
#ifdef __KERNEL__
-#include "gpib_user.h"
+#include "gpib.h"
#include <linux/atomic.h>
#include <linux/device.h>
#include <linux/mutex.h>
diff --git a/drivers/staging/gpib/uapi/gpib_user.h b/drivers/staging/gpib/uapi/gpib.h
similarity index 100%
rename from drivers/staging/gpib/uapi/gpib_user.h
rename to drivers/staging/gpib/uapi/gpib.h
--
2.49.0
prev parent reply other threads:[~2025-04-18 9:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-18 9:31 [PATCH 0/2] staging: gpib: Clean and rename common include Dave Penkler
2025-04-18 9:31 ` [PATCH 1/2] staging: gpib: Remove unused enums from common include file Dave Penkler
2025-04-18 9:31 ` Dave Penkler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250418093111.8820-3-dpenkler@gmail.com \
--to=dpenkler@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox