Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / joystick / iforce / iforce.h

diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index 68558c594e549b075ba50c4f9572ff0debb7c5d9..9cfa460466aa783fb11f76e1b3838fd9a5fa6eb4 100644 (file)
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *  Copyright (c) 2000-2002 Vojtech Pavlik <vojtech@ucw.cz>
  *  Copyright (c) 2001-2002, 2007 Johann Deneux <johann.deneux@gmail.com>
@@ -6,19 +7,6 @@
  */
 
 /*
- * 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 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <linux/kernel.h>
@@ -38,10 +26,6 @@
 
 #define IFORCE_MAX_LENGTH      16
 
-/* iforce::bus */
-#define IFORCE_232     1
-#define IFORCE_USB     2
-
 #define IFORCE_EFFECTS_MAX     32
 
 /* Each force feedback effect is made of one core effect, which can be
@@ -105,9 +89,6 @@ struct iforce {
        struct input_dev *dev;          /* Input device interface */
        struct iforce_device *type;
        const struct iforce_xport_ops *xport_ops;
-       int bus;
-
-       unsigned char data[IFORCE_MAX_LENGTH];
 
        spinlock_t xmit_lock;
        /* Buffer used for asynchronous sending of bytes to the device */