USB: serial: io_edgeport: drop unused definitions

Drop unused definitions relating to a never mainlined custom
proc-interface and some likewise unused string descriptor definitions.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index 43ba53a..7c9f62a 100644 (file)
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -10,7 +10,6 @@
 #if !defined(_IO_EDGEPORT_H_)
 #define        _IO_EDGEPORT_H_
 
-
 #define MAX_RS232_PORTS                8       /* Max # of RS-232 ports per device */
 
 /* typedefs that the insideout headers need */
@@ -21,57 +20,8 @@
        #define HIGH8(a)        ((unsigned char)((a & 0xff00) >> 8))
 #endif
 
-#ifndef __KERNEL__
-#define __KERNEL__
-#endif
-
 #include "io_usbvend.h"
 
-
-
-/* The following table is used to map the USBx port number to
- * the device serial number (or physical USB path), */
-#define MAX_EDGEPORTS  64
-
-struct comMapper {
-       char    SerialNumber[MAX_SERIALNUMBER_LEN+1];   /* Serial number/usb path */
-       int     numPorts;                               /* Number of ports */
-       int     Original[MAX_RS232_PORTS];              /* Port numbers set by IOCTL */
-       int     Port[MAX_RS232_PORTS];                  /* Actual used port numbers */
-};
-
-
-#define EDGEPORT_CONFIG_DEVICE "/proc/edgeport"
-
-/* /proc/edgeport Interface
- * This interface uses read/write/lseek interface to talk to the edgeport driver
- * the following read functions are supported: */
-#define PROC_GET_MAPPING_TO_PATH       1
-#define PROC_GET_COM_ENTRY             2
-#define PROC_GET_EDGE_MANUF_DESCRIPTOR 3
-#define PROC_GET_BOOT_DESCRIPTOR       4
-#define PROC_GET_PRODUCT_INFO          5
-#define PROC_GET_STRINGS               6
-#define PROC_GET_CURRENT_COM_MAPPING   7
-
-/* The parameters to the lseek() for the read is: */
-#define PROC_READ_SETUP(Command, Argument)     ((Command) + ((Argument)<<8))
-
-
-/* the following write functions are supported: */
-#define PROC_SET_COM_MAPPING           1
-#define PROC_SET_COM_ENTRY             2
-
-
-/* The following structure is passed to the write */
-struct procWrite {
-       int     Command;
-       union {
-               struct comMapper        Entry;
-               int                     ComMappingBasedOnUSBPort;       /* Boolean value */
-       } u;
-};
-
 /*
  *     Product information read from the Edgeport
  */
@@ -108,22 +58,4 @@ struct edgeport_product_info {
        struct edge_compatibility_bits Epic;
 };
 
-/*
- *     Edgeport Stringblock String locations
- */
-#define EDGESTRING_MANUFNAME           1       /* Manufacture Name */
-#define EDGESTRING_PRODNAME            2       /* Product Name */
-#define EDGESTRING_SERIALNUM           3       /* Serial Number */
-#define EDGESTRING_ASSEMNUM            4       /* Assembly Number */
-#define EDGESTRING_OEMASSEMNUM         5       /* OEM Assembly Number */
-#define EDGESTRING_MANUFDATE           6       /* Manufacture Date */
-#define EDGESTRING_ORIGSERIALNUM       7       /* Serial Number */
-
-struct string_block {
-       __u16   NumStrings;                     /* Number of strings in block */
-       __u16   Strings[1];                     /* Start of string block */
-};
-
-
-
 #endif