Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dgnc: remove old 2.4-2.6 compat kernel defines

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Giedrius Statkevičius and committed by
Greg Kroah-Hartman
20dad752 d533a524

+1 -42
-1
drivers/staging/dgnc/dgnc_driver.h
··· 26 26 #include <linux/interrupt.h> /* For irqreturn_t type */ 27 27 28 28 #include "digi.h" /* Digi specific ioctl header */ 29 - #include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */ 30 29 #include "dgnc_sysfs.h" /* Support for SYSFS */ 31 30 32 31 /*************************************************************************
-40
drivers/staging/dgnc/dgnc_kcompat.h
··· 1 - /* 2 - * Copyright 2004 Digi International (www.digi.com) 3 - * Scott H Kilau <Scott_Kilau at digi dot com> 4 - * 5 - * This program is free software; you can redistribute it and/or modify 6 - * it under the terms of the GNU General Public License as published by 7 - * the Free Software Foundation; either version 2, or (at your option) 8 - * any later version. 9 - * 10 - * This program is distributed in the hope that it will be useful, 11 - * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the 12 - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 13 - * PURPOSE. See the GNU General Public License for more details. 14 - * 15 - ************************************************************************* 16 - * 17 - * This file is intended to contain all the kernel "differences" between the 18 - * various kernels that we support. 19 - * 20 - *************************************************************************/ 21 - 22 - #ifndef __DGNC_KCOMPAT_H 23 - #define __DGNC_KCOMPAT_H 24 - 25 - #if !defined(TTY_FLIPBUF_SIZE) 26 - # define TTY_FLIPBUF_SIZE 512 27 - #endif 28 - 29 - 30 - /* Sparse stuff */ 31 - # ifndef __user 32 - # define __user 33 - # define __kernel 34 - # define __safe 35 - # define __force 36 - # define __chk_user_ptr(x) (void)0 37 - # endif 38 - 39 - 40 - #endif /* ! __DGNC_KCOMPAT_H */
-1
drivers/staging/dgnc/dgnc_mgmt.c
··· 30 30 31 31 #include "dgnc_driver.h" 32 32 #include "dgnc_pci.h" 33 - #include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */ 34 33 #include "dgnc_mgmt.h" 35 34 36 35
+1
drivers/staging/dgnc/digi.h
··· 175 175 #define T_NEO_EXPRESS 0001 176 176 #define T_NEO 0000 177 177 178 + #define TTY_FLIPBUF_SIZE 512 178 179 #endif /* DIGI_H */