s390/cio: clean up DEV_STATE_SENSE_PGID

Clean up DEV_STATE_SENSE_PGID related code, since it's not
used anymore. Everything related to path verification is
handled within DEV_STATE_VERIFY.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 065b1be98e2c5b73e73cadc5547b5c1b7ec2cec9..ec497af99dd8acfb74c388f990201214ee02713e 100644 (file)
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -13,7 +13,6 @@
  */
 enum dev_state {
        DEV_STATE_NOT_OPER,
-       DEV_STATE_SENSE_PGID,
        DEV_STATE_SENSE_ID,
        DEV_STATE_OFFLINE,
        DEV_STATE_VERIFY,

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 8327d47e08b6a0617b7ebc172ce91aafcb8c9283..9afb5ce130071116a25193f1d0d921dc620a656a 100644 (file)
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -1058,12 +1058,6 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
                [DEV_EVENT_TIMEOUT]     = ccw_device_nop,
                [DEV_EVENT_VERIFY]      = ccw_device_nop,
        },
-       [DEV_STATE_SENSE_PGID] = {
-               [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
-               [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
-               [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
-               [DEV_EVENT_VERIFY]      = ccw_device_nop,
-       },
        [DEV_STATE_SENSE_ID] = {
                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,