net/af_iucv: remove pm support

commit 394216275c7d ("s390: remove broken hibernate / power management support")
removed support for ARCH_HIBERNATION_POSSIBLE from s390.

So drop the unused pm ops from the s390-only af_iucv socket code.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index c4bdcbc..84bd18f 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -87,7 +87,6 @@ do {                                                                  \
 
 static void iucv_sock_kill(struct sock *sk);
 static void iucv_sock_close(struct sock *sk);
-static void iucv_sever_path(struct sock *, int);
 
 static int afiucv_hs_rcv(struct sk_buff *skb, struct net_device *dev,
        struct packet_type *pt, struct net_device *orig_dev);
@@ -127,110 +126,6 @@ static inline void low_nmcpy(unsigned char *dst, char *src)
        memcpy(&dst[8], src, 8);
 }
 
-static int afiucv_pm_prepare(struct device *dev)
-{
-#ifdef CONFIG_PM_DEBUG
-       printk(KERN_WARNING "afiucv_pm_prepare\n");
-#endif
-       return 0;
-}
-
-static void afiucv_pm_complete(struct device *dev)
-{
-#ifdef CONFIG_PM_DEBUG
-       printk(KERN_WARNING "afiucv_pm_complete\n");
-#endif
-}
-
-/**
- * afiucv_pm_freeze() - Freeze PM callback
- * @dev:       AFIUCV dummy device
- *
- * Sever all established IUCV communication pathes
- */
-static int afiucv_pm_freeze(struct device *dev)
-{
-       struct iucv_sock *iucv;
-       struct sock *sk;
-
-#ifdef CONFIG_PM_DEBUG
-       printk(KERN_WARNING "afiucv_pm_freeze\n");
-#endif
-       read_lock(&iucv_sk_list.lock);
-       sk_for_each(sk, &iucv_sk_list.head) {
-               iucv = iucv_sk(sk);
-               switch (sk->sk_state) {
-               case IUCV_DISCONN:
-               case IUCV_CLOSING:
-               case IUCV_CONNECTED:
-                       iucv_sever_path(sk, 0);
-                       break;
-               case IUCV_OPEN:
-               case IUCV_BOUND:
-               case IUCV_LISTEN:
-               case IUCV_CLOSED:
-               default:
-                       break;
-               }
-               skb_queue_purge(&iucv->send_skb_q);
-               skb_queue_purge(&iucv->backlog_skb_q);
-       }
-       read_unlock(&iucv_sk_list.lock);
-       return 0;
-}
-
-/**
- * afiucv_pm_restore_thaw() - Thaw and restore PM callback
- * @dev:       AFIUCV dummy device
- *
- * socket clean up after freeze
- */
-static int afiucv_pm_restore_thaw(struct device *dev)
-{
-       struct sock *sk;
-
-#ifdef CONFIG_PM_DEBUG
-       printk(KERN_WARNING "afiucv_pm_restore_thaw\n");
-#endif
-       read_lock(&iucv_sk_list.lock);
-       sk_for_each(sk, &iucv_sk_list.head) {
-               switch (sk->sk_state) {
-               case IUCV_CONNECTED:
-                       sk->sk_err = EPIPE;
-                       sk->sk_state = IUCV_DISCONN;
-                       sk->sk_state_change(sk);
-                       break;
-               case IUCV_DISCONN:
-               case IUCV_CLOSING:
-               case IUCV_LISTEN:
-               case IUCV_BOUND:
-               case IUCV_OPEN:
-               default:
-                       break;
-               }
-       }
-       read_unlock(&iucv_sk_list.lock);
-       return 0;
-}
-
-static const struct dev_pm_ops afiucv_pm_ops = {
-       .prepare = afiucv_pm_prepare,
-       .complete = afiucv_pm_complete,
-       .freeze = afiucv_pm_freeze,
-       .thaw = afiucv_pm_restore_thaw,
-       .restore = afiucv_pm_restore_thaw,
-};
-
-static struct device_driver af_iucv_driver = {
-       .owner = THIS_MODULE,
-       .name = "afiucv",
-       .bus  = NULL,
-       .pm   = &afiucv_pm_ops,
-};
-
-/* dummy device used as trigger for PM functions */
-static struct device *af_iucv_dev;
-
 /**
  * iucv_msg_length() - Returns the length of an iucv message.
  * @msg:       Pointer to struct iucv_message, MUST NOT be NULL
@@ -2409,45 +2304,11 @@ static struct packet_type iucv_packet_type = {
 
 static int afiucv_iucv_init(void)
 {
-       int err;
-
-       err = pr_iucv->iucv_register(&af_iucv_handler, 0);
-       if (err)
-               goto out;
-       /* establish dummy device */
-       af_iucv_driver.bus = pr_iucv->bus;
-       err = driver_register(&af_iucv_driver);
-       if (err)
-               goto out_iucv;
-       af_iucv_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
-       if (!af_iucv_dev) {
-               err = -ENOMEM;
-               goto out_driver;
-       }
-       dev_set_name(af_iucv_dev, "af_iucv");
-       af_iucv_dev->bus = pr_iucv->bus;
-       af_iucv_dev->parent = pr_iucv->root;
-       af_iucv_dev->release = (void (*)(struct device *))kfree;
-       af_iucv_dev->driver = &af_iucv_driver;
-       err = device_register(af_iucv_dev);
-       if (err)
-               goto out_iucv_dev;
-       return 0;
-
-out_iucv_dev:
-       put_device(af_iucv_dev);
-out_driver:
-       driver_unregister(&af_iucv_driver);
-out_iucv:
-       pr_iucv->iucv_unregister(&af_iucv_handler, 0);
-out:
-       return err;
+       return pr_iucv->iucv_register(&af_iucv_handler, 0);
 }
 
 static void afiucv_iucv_exit(void)
 {
-       device_unregister(af_iucv_dev);
-       driver_unregister(&af_iucv_driver);
        pr_iucv->iucv_unregister(&af_iucv_handler, 0);
 }