ipack: remove ipack_ids.h file
Its contents are merged into ipack.h. So this file is not needed. Doing that, it simplifies the ipack-related driver development. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
7dbce021a6
Коммит
27cf2d1b87
|
@ -23,7 +23,6 @@
|
|||
#include <linux/atomic.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/ipack.h>
|
||||
#include "../ipack_ids.h"
|
||||
#include "ipoctal.h"
|
||||
#include "scc2698.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include <linux/idr.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/ipack.h>
|
||||
#include "ipack_ids.h"
|
||||
|
||||
#define to_ipack_dev(device) container_of(device, struct ipack_device, dev)
|
||||
#define to_ipack_driver(drv) container_of(drv, struct ipack_driver, driver)
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* IndustryPack Fromat, Vendor and Device IDs.
|
||||
*/
|
||||
|
||||
/* ID section format versions */
|
||||
#define IPACK_ID_VERSION_INVALID 0x00
|
||||
#define IPACK_ID_VERSION_1 0x01
|
||||
#define IPACK_ID_VERSION_2 0x02
|
||||
|
||||
/* Vendors and devices. Sort key: vendor first, device next. */
|
||||
#define IPACK1_VENDOR_ID_RESERVED1 0x00
|
||||
#define IPACK1_VENDOR_ID_RESERVED2 0xFF
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED01 0x01
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED02 0x02
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED03 0x03
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED04 0x04
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED05 0x05
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED06 0x06
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED07 0x07
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED08 0x08
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED09 0x09
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED10 0x0A
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED11 0x0B
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED12 0x0C
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED13 0x0D
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED14 0x0E
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED15 0x0F
|
||||
|
||||
#define IPACK1_VENDOR_ID_SBS 0xF0
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_232 0x22
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_422 0x2A
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_485 0x48
|
|
@ -26,6 +26,39 @@
|
|||
#define IPACK_IDPROM_OFFSET_NUM_BYTES 0x15
|
||||
#define IPACK_IDPROM_OFFSET_CRC 0x17
|
||||
|
||||
/*
|
||||
* IndustryPack Fromat, Vendor and Device IDs.
|
||||
*/
|
||||
|
||||
/* ID section format versions */
|
||||
#define IPACK_ID_VERSION_INVALID 0x00
|
||||
#define IPACK_ID_VERSION_1 0x01
|
||||
#define IPACK_ID_VERSION_2 0x02
|
||||
|
||||
/* Vendors and devices. Sort key: vendor first, device next. */
|
||||
#define IPACK1_VENDOR_ID_RESERVED1 0x00
|
||||
#define IPACK1_VENDOR_ID_RESERVED2 0xFF
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED01 0x01
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED02 0x02
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED03 0x03
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED04 0x04
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED05 0x05
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED06 0x06
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED07 0x07
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED08 0x08
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED09 0x09
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED10 0x0A
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED11 0x0B
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED12 0x0C
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED13 0x0D
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED14 0x0E
|
||||
#define IPACK1_VENDOR_ID_UNREGISTRED15 0x0F
|
||||
|
||||
#define IPACK1_VENDOR_ID_SBS 0xF0
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_232 0x22
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_422 0x2A
|
||||
#define IPACK1_DEVICE_ID_SBS_OCTAL_485 0x48
|
||||
|
||||
struct ipack_bus_ops;
|
||||
struct ipack_driver;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче