From: "Giedrius Statkevičius" <giedrius.statkevicius@gmail.com>
To: lidza.louina@gmail.com, markh@compro.net
Cc: gregkh@linuxfoundation.org,
driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
"Giedrius Statkevičius" <giedrius.statkevicius@gmail.com>
Subject: [PATCH v2 5/7] dgnc: remove old 2.4-2.6 compat kernel defines
Date: Fri, 13 Mar 2015 15:56:33 +0200 [thread overview]
Message-ID: <1426254995-28359-5-git-send-email-giedrius.statkevicius@gmail.com> (raw)
In-Reply-To: <1426254995-28359-1-git-send-email-giedrius.statkevicius@gmail.com>
dgnc_kcompat.h contains some old legacy defines in case the kernel
doesn't have __user defined but for current kernel versions these
defines don't make sense and are useless so remove them. Move the
TTY_FLIPBUF_SIZE define to digi.h because it's used in the code.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: No change
drivers/staging/dgnc/dgnc_driver.h | 1 -
drivers/staging/dgnc/dgnc_kcompat.h | 40 -------------------------------------
drivers/staging/dgnc/dgnc_mgmt.c | 1 -
drivers/staging/dgnc/digi.h | 1 +
4 files changed, 1 insertion(+), 42 deletions(-)
delete mode 100644 drivers/staging/dgnc/dgnc_kcompat.h
diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 2bde3b2..f77fed5 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -26,7 +26,6 @@
#include <linux/interrupt.h> /* For irqreturn_t type */
#include "digi.h" /* Digi specific ioctl header */
-#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_sysfs.h" /* Support for SYSFS */
/*************************************************************************
diff --git a/drivers/staging/dgnc/dgnc_kcompat.h b/drivers/staging/dgnc/dgnc_kcompat.h
deleted file mode 100644
index 2206038..0000000
--- a/drivers/staging/dgnc/dgnc_kcompat.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2004 Digi International (www.digi.com)
- * Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- *************************************************************************
- *
- * This file is intended to contain all the kernel "differences" between the
- * various kernels that we support.
- *
- *************************************************************************/
-
-#ifndef __DGNC_KCOMPAT_H
-#define __DGNC_KCOMPAT_H
-
-#if !defined(TTY_FLIPBUF_SIZE)
-# define TTY_FLIPBUF_SIZE 512
-#endif
-
-
-/* Sparse stuff */
-# ifndef __user
-# define __user
-# define __kernel
-# define __safe
-# define __force
-# define __chk_user_ptr(x) (void)0
-# endif
-
-
-#endif /* ! __DGNC_KCOMPAT_H */
diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c
index 1a00eac..d0e22c1 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.c
+++ b/drivers/staging/dgnc/dgnc_mgmt.c
@@ -30,7 +30,6 @@
#include "dgnc_driver.h"
#include "dgnc_pci.h"
-#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_mgmt.h"
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 281b975..d637a78 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -175,4 +175,5 @@ struct ni_info {
#define T_NEO_EXPRESS 0001
#define T_NEO 0000
+#define TTY_FLIPBUF_SIZE 512
#endif /* DIGI_H */
--
2.3.2
next prev parent reply other threads:[~2015-03-13 13:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 2/7] dgnc: clean up digi.h Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 3/7] dgnc: get rid of dpacompat.h, move remaining stuff to digi.h Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 4/7] dgnc: use linux/types.h instead of dgnc_types.h Giedrius Statkevičius
2015-03-13 13:56 ` Giedrius Statkevičius [this message]
2015-03-13 13:56 ` [PATCH v2 6/7] dgnc: remove unused stuff from dgnc_cls.h Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 7/7] dgnc: Clean up dgnc_sysfs.h Giedrius Statkevičius
2015-03-17 14:35 ` [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
2015-03-17 14:48 ` Greg KH
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=1426254995-28359-5-git-send-email-giedrius.statkevicius@gmail.com \
--to=giedrius.statkevicius@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=lidza.louina@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markh@compro.net \
/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
all inboxes | Powered by JetHome®