diff options
| author | Ursula Braun <ursula.braun@de.ibm.com> | 2009-11-12 21:46:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-13 20:47:00 -0800 |
| commit | 0ca8cc6fe7e1acd42a8a3741473ad7540f13893a (patch) | |
| tree | aa443f7574e8a8e3a0aee0bd84ab852e4eac2294 /drivers/s390/net/ctcm_main.h | |
| parent | 1e1815be87e45ce512f998ab35e9554c25031f4d (diff) | |
| download | op-kernel-dev-0ca8cc6fe7e1acd42a8a3741473ad7540f13893a.zip op-kernel-dev-0ca8cc6fe7e1acd42a8a3741473ad7540f13893a.tar.gz | |
s390: remove cu3088 layer for lcs and ctcm
The cu3088-driver used as common base for lcs- and ctcm-devices
makes it difficult to assign the appropriate driver to an lcs-device
or a ctcm-device. This patch eliminates the cu3088-driver and thus
the root device "cu3088". Path /sys/devices/cu3088 is replaced with
the pathes /sys/devices/lcs and /sys/devices/ctcm.
Patch is based on a proposal from Cornelia Huck.
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/ctcm_main.h')
| -rw-r--r-- | drivers/s390/net/ctcm_main.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h index d925e73..d34fa14 100644 --- a/drivers/s390/net/ctcm_main.h +++ b/drivers/s390/net/ctcm_main.h @@ -16,7 +16,6 @@ #include <linux/netdevice.h> #include "fsm.h" -#include "cu3088.h" #include "ctcm_dbug.h" #include "ctcm_mpc.h" @@ -66,6 +65,23 @@ ctcmpc_dumpit(buf, len); \ } while (0) +/** + * Enum for classifying detected devices + */ +enum ctcm_channel_types { + /* Device is not a channel */ + ctcm_channel_type_none, + + /* Device is a CTC/A */ + ctcm_channel_type_parallel, + + /* Device is a FICON channel */ + ctcm_channel_type_ficon, + + /* Device is a ESCON channel */ + ctcm_channel_type_escon +}; + /* * CCW commands, used in this driver. */ @@ -121,7 +137,7 @@ struct channel { * Type of this channel. * CTC/A or Escon for valid channels. */ - enum channel_types type; + enum ctcm_channel_types type; /* * Misc. flags. See CHANNEL_FLAGS_... below */ |
