s390/net: remove pm support from iucv drivers
Commit 394216275c ("s390: remove broken hibernate / power management support")
removed support for ARCH_HIBERNATION_POSSIBLE on s390.
So drop the unused pm ops from the iucv drivers.
CC: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann
David S. Miller
Родитель
fc4a4515ac
Коммит
97ccf6f9ae
|
|
@ -112,27 +112,10 @@ DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf);
|
|||
*/
|
||||
#define PRINTK_HEADER " iucv: " /* for debugging */
|
||||
|
||||
/* dummy device to make sure netiucv_pm functions are called */
|
||||
static struct device *netiucv_dev;
|
||||
|
||||
static int netiucv_pm_prepare(struct device *);
|
||||
static void netiucv_pm_complete(struct device *);
|
||||
static int netiucv_pm_freeze(struct device *);
|
||||
static int netiucv_pm_restore_thaw(struct device *);
|
||||
|
||||
static const struct dev_pm_ops netiucv_pm_ops = {
|
||||
.prepare = netiucv_pm_prepare,
|
||||
.complete = netiucv_pm_complete,
|
||||
.freeze = netiucv_pm_freeze,
|
||||
.thaw = netiucv_pm_restore_thaw,
|
||||
.restore = netiucv_pm_restore_thaw,
|
||||
};
|
||||
|
||||
static struct device_driver netiucv_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "netiucv",
|
||||
.bus = &iucv_bus,
|
||||
.pm = &netiucv_pm_ops,
|
||||
};
|
||||
|
||||
static int netiucv_callback_connreq(struct iucv_path *, u8 *, u8 *);
|
||||
|
|
@ -213,7 +196,6 @@ struct netiucv_priv {
|
|||
fsm_instance *fsm;
|
||||
struct iucv_connection *conn;
|
||||
struct device *dev;
|
||||
int pm_state;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1275,72 +1257,6 @@ static int netiucv_close(struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int netiucv_pm_prepare(struct device *dev)
|
||||
{
|
||||
IUCV_DBF_TEXT(trace, 3, __func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void netiucv_pm_complete(struct device *dev)
|
||||
{
|
||||
IUCV_DBF_TEXT(trace, 3, __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* netiucv_pm_freeze() - Freeze PM callback
|
||||
* @dev: netiucv device
|
||||
*
|
||||
* close open netiucv interfaces
|
||||
*/
|
||||
static int netiucv_pm_freeze(struct device *dev)
|
||||
{
|
||||
struct netiucv_priv *priv = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = NULL;
|
||||
int rc = 0;
|
||||
|
||||
IUCV_DBF_TEXT(trace, 3, __func__);
|
||||
if (priv && priv->conn)
|
||||
ndev = priv->conn->netdev;
|
||||
if (!ndev)
|
||||
goto out;
|
||||
netif_device_detach(ndev);
|
||||
priv->pm_state = fsm_getstate(priv->fsm);
|
||||
rc = netiucv_close(ndev);
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* netiucv_pm_restore_thaw() - Thaw and restore PM callback
|
||||
* @dev: netiucv device
|
||||
*
|
||||
* re-open netiucv interfaces closed during freeze
|
||||
*/
|
||||
static int netiucv_pm_restore_thaw(struct device *dev)
|
||||
{
|
||||
struct netiucv_priv *priv = dev_get_drvdata(dev);
|
||||
struct net_device *ndev = NULL;
|
||||
int rc = 0;
|
||||
|
||||
IUCV_DBF_TEXT(trace, 3, __func__);
|
||||
if (priv && priv->conn)
|
||||
ndev = priv->conn->netdev;
|
||||
if (!ndev)
|
||||
goto out;
|
||||
switch (priv->pm_state) {
|
||||
case DEV_STATE_RUNNING:
|
||||
case DEV_STATE_STARTWAIT:
|
||||
rc = netiucv_open(ndev);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
netif_device_attach(ndev);
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
* Start transmission of a packet.
|
||||
* Called from generic network device layer.
|
||||
|
|
@ -2156,7 +2072,6 @@ static void __exit netiucv_exit(void)
|
|||
netiucv_unregister_device(dev);
|
||||
}
|
||||
|
||||
device_unregister(netiucv_dev);
|
||||
driver_unregister(&netiucv_driver);
|
||||
iucv_unregister(&netiucv_handler, 1);
|
||||
iucv_unregister_dbf_views();
|
||||
|
|
@ -2182,27 +2097,10 @@ static int __init netiucv_init(void)
|
|||
IUCV_DBF_TEXT_(setup, 2, "ret %d from driver_register\n", rc);
|
||||
goto out_iucv;
|
||||
}
|
||||
/* establish dummy device */
|
||||
netiucv_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
|
||||
if (!netiucv_dev) {
|
||||
rc = -ENOMEM;
|
||||
goto out_driver;
|
||||
}
|
||||
dev_set_name(netiucv_dev, "netiucv");
|
||||
netiucv_dev->bus = &iucv_bus;
|
||||
netiucv_dev->parent = iucv_root;
|
||||
netiucv_dev->release = (void (*)(struct device *))kfree;
|
||||
netiucv_dev->driver = &netiucv_driver;
|
||||
rc = device_register(netiucv_dev);
|
||||
if (rc) {
|
||||
put_device(netiucv_dev);
|
||||
goto out_driver;
|
||||
}
|
||||
|
||||
netiucv_banner();
|
||||
return rc;
|
||||
|
||||
out_driver:
|
||||
driver_unregister(&netiucv_driver);
|
||||
out_iucv:
|
||||
iucv_unregister(&netiucv_handler, 1);
|
||||
out_dbf:
|
||||
|
|
|
|||
|
|
@ -29,12 +29,9 @@ MODULE_AUTHOR
|
|||
MODULE_DESCRIPTION ("Linux for S/390 IUCV special message driver");
|
||||
|
||||
static struct iucv_path *smsg_path;
|
||||
/* dummy device used as trigger for PM functions */
|
||||
static struct device *smsg_dev;
|
||||
|
||||
static DEFINE_SPINLOCK(smsg_list_lock);
|
||||
static LIST_HEAD(smsg_list);
|
||||
static int iucv_path_connected;
|
||||
|
||||
static int smsg_path_pending(struct iucv_path *, u8 *, u8 *);
|
||||
static void smsg_message_pending(struct iucv_path *, struct iucv_message *);
|
||||
|
|
@ -124,60 +121,15 @@ void smsg_unregister_callback(const char *prefix,
|
|||
kfree(cb);
|
||||
}
|
||||
|
||||
static int smsg_pm_freeze(struct device *dev)
|
||||
{
|
||||
#ifdef CONFIG_PM_DEBUG
|
||||
printk(KERN_WARNING "smsg_pm_freeze\n");
|
||||
#endif
|
||||
if (smsg_path && iucv_path_connected) {
|
||||
iucv_path_sever(smsg_path, NULL);
|
||||
iucv_path_connected = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int smsg_pm_restore_thaw(struct device *dev)
|
||||
{
|
||||
int rc;
|
||||
|
||||
#ifdef CONFIG_PM_DEBUG
|
||||
printk(KERN_WARNING "smsg_pm_restore_thaw\n");
|
||||
#endif
|
||||
if (smsg_path && !iucv_path_connected) {
|
||||
memset(smsg_path, 0, sizeof(*smsg_path));
|
||||
smsg_path->msglim = 255;
|
||||
smsg_path->flags = 0;
|
||||
rc = iucv_path_connect(smsg_path, &smsg_handler, "*MSG ",
|
||||
NULL, NULL, NULL);
|
||||
#ifdef CONFIG_PM_DEBUG
|
||||
if (rc)
|
||||
printk(KERN_ERR
|
||||
"iucv_path_connect returned with rc %i\n", rc);
|
||||
#endif
|
||||
if (!rc)
|
||||
iucv_path_connected = 1;
|
||||
cpcmd("SET SMSG IUCV", NULL, 0, NULL);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops smsg_pm_ops = {
|
||||
.freeze = smsg_pm_freeze,
|
||||
.thaw = smsg_pm_restore_thaw,
|
||||
.restore = smsg_pm_restore_thaw,
|
||||
};
|
||||
|
||||
static struct device_driver smsg_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = SMSGIUCV_DRV_NAME,
|
||||
.bus = &iucv_bus,
|
||||
.pm = &smsg_pm_ops,
|
||||
};
|
||||
|
||||
static void __exit smsg_exit(void)
|
||||
{
|
||||
cpcmd("SET SMSG OFF", NULL, 0, NULL);
|
||||
device_unregister(smsg_dev);
|
||||
iucv_unregister(&smsg_handler, 1);
|
||||
driver_unregister(&smsg_driver);
|
||||
}
|
||||
|
|
@ -205,27 +157,10 @@ static int __init smsg_init(void)
|
|||
NULL, NULL, NULL);
|
||||
if (rc)
|
||||
goto out_free_path;
|
||||
else
|
||||
iucv_path_connected = 1;
|
||||
smsg_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
|
||||
if (!smsg_dev) {
|
||||
rc = -ENOMEM;
|
||||
goto out_free_path;
|
||||
}
|
||||
dev_set_name(smsg_dev, "smsg_iucv");
|
||||
smsg_dev->bus = &iucv_bus;
|
||||
smsg_dev->parent = iucv_root;
|
||||
smsg_dev->release = (void (*)(struct device *))kfree;
|
||||
smsg_dev->driver = &smsg_driver;
|
||||
rc = device_register(smsg_dev);
|
||||
if (rc)
|
||||
goto out_put;
|
||||
|
||||
cpcmd("SET SMSG IUCV", NULL, 0, NULL);
|
||||
return 0;
|
||||
|
||||
out_put:
|
||||
put_device(smsg_dev);
|
||||
out_free_path:
|
||||
iucv_path_free(smsg_path);
|
||||
smsg_path = NULL;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче