Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dad752 authored by Giedrius Statkevičius's avatar Giedrius Statkevičius Committed by Greg Kroah-Hartman
Browse files

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: default avatarGiedrius Statkevičius <giedrius.statkevicius@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d533a524

drivers/staging/dgnc/dgnc_driver.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */



/*************************************************************************

drivers/staging/dgnc/dgnc_kcompat.h

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * 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 */

drivers/staging/dgnc/dgnc_mgmt.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/staging/dgnc/digi.h

+1 −0
Original line number Diff line number Diff line
@@ -175,4 +175,5 @@ struct ni_info { 
#define T_NEO_EXPRESS 0001

#define T_NEO 0000



#define TTY_FLIPBUF_SIZE 512

#endif /* DIGI_H */