[PATCH] 3c509: use proper suspend/resume API
Convert 3c509 driver to use proper suspend/resume API instead of the deprecated pm_register/pm_unregister. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
827700866a
commit
60a89ff6d2
|
@ -100,6 +100,10 @@ static int max_interrupt_work = 10;
|
||||||
static char versionA[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
|
static char versionA[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
|
||||||
static char versionB[] __initdata = "http://www.scyld.com/network/3c509.html\n";
|
static char versionB[] __initdata = "http://www.scyld.com/network/3c509.html\n";
|
||||||
|
|
||||||
|
#if defined(CONFIG_PM) && (defined(CONFIG_MCA) || defined(CONFIG_EISA))
|
||||||
|
#define EL3_SUSPEND
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef EL3_DEBUG
|
#ifdef EL3_DEBUG
|
||||||
static int el3_debug = EL3_DEBUG;
|
static int el3_debug = EL3_DEBUG;
|
||||||
#else
|
#else
|
||||||
|
@ -174,9 +178,6 @@ struct el3_private {
|
||||||
/* skb send-queue */
|
/* skb send-queue */
|
||||||
int head, size;
|
int head, size;
|
||||||
struct sk_buff *queue[SKB_QUEUE_SIZE];
|
struct sk_buff *queue[SKB_QUEUE_SIZE];
|
||||||
#ifdef CONFIG_PM_LEGACY
|
|
||||||
struct pm_dev *pmdev;
|
|
||||||
#endif
|
|
||||||
enum {
|
enum {
|
||||||
EL3_MCA,
|
EL3_MCA,
|
||||||
EL3_PNP,
|
EL3_PNP,
|
||||||
|
@ -201,11 +202,15 @@ static void el3_tx_timeout (struct net_device *dev);
|
||||||
static void el3_down(struct net_device *dev);
|
static void el3_down(struct net_device *dev);
|
||||||
static void el3_up(struct net_device *dev);
|
static void el3_up(struct net_device *dev);
|
||||||
static struct ethtool_ops ethtool_ops;
|
static struct ethtool_ops ethtool_ops;
|
||||||
#ifdef CONFIG_PM_LEGACY
|
#ifdef EL3_SUSPEND
|
||||||
static int el3_suspend(struct pm_dev *pdev);
|
static int el3_suspend(struct device *, pm_message_t);
|
||||||
static int el3_resume(struct pm_dev *pdev);
|
static int el3_resume(struct device *);
|
||||||
static int el3_pm_callback(struct pm_dev *pdev, pm_request_t rqst, void *data);
|
#else
|
||||||
|
#define el3_suspend NULL
|
||||||
|
#define el3_resume NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* generic device remove for all device types */
|
/* generic device remove for all device types */
|
||||||
#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
|
#if defined(CONFIG_EISA) || defined(CONFIG_MCA)
|
||||||
static int el3_device_remove (struct device *device);
|
static int el3_device_remove (struct device *device);
|
||||||
|
@ -229,7 +234,9 @@ static struct eisa_driver el3_eisa_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "3c509",
|
.name = "3c509",
|
||||||
.probe = el3_eisa_probe,
|
.probe = el3_eisa_probe,
|
||||||
.remove = __devexit_p (el3_device_remove)
|
.remove = __devexit_p (el3_device_remove),
|
||||||
|
.suspend = el3_suspend,
|
||||||
|
.resume = el3_resume,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
@ -262,6 +269,8 @@ static struct mca_driver el3_mca_driver = {
|
||||||
.bus = &mca_bus_type,
|
.bus = &mca_bus_type,
|
||||||
.probe = el3_mca_probe,
|
.probe = el3_mca_probe,
|
||||||
.remove = __devexit_p(el3_device_remove),
|
.remove = __devexit_p(el3_device_remove),
|
||||||
|
.suspend = el3_suspend,
|
||||||
|
.resume = el3_resume,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_MCA */
|
#endif /* CONFIG_MCA */
|
||||||
|
@ -362,10 +371,6 @@ static void el3_common_remove (struct net_device *dev)
|
||||||
struct el3_private *lp = netdev_priv(dev);
|
struct el3_private *lp = netdev_priv(dev);
|
||||||
|
|
||||||
(void) lp; /* Keep gcc quiet... */
|
(void) lp; /* Keep gcc quiet... */
|
||||||
#ifdef CONFIG_PM_LEGACY
|
|
||||||
if (lp->pmdev)
|
|
||||||
pm_unregister(lp->pmdev);
|
|
||||||
#endif
|
|
||||||
#if defined(__ISAPNP__)
|
#if defined(__ISAPNP__)
|
||||||
if (lp->type == EL3_PNP)
|
if (lp->type == EL3_PNP)
|
||||||
pnp_device_detach(to_pnp_dev(lp->dev));
|
pnp_device_detach(to_pnp_dev(lp->dev));
|
||||||
|
@ -572,16 +577,6 @@ no_pnp:
|
||||||
if (err)
|
if (err)
|
||||||
goto out1;
|
goto out1;
|
||||||
|
|
||||||
#ifdef CONFIG_PM_LEGACY
|
|
||||||
/* register power management */
|
|
||||||
lp->pmdev = pm_register(PM_ISA_DEV, card_idx, el3_pm_callback);
|
|
||||||
if (lp->pmdev) {
|
|
||||||
struct pm_dev *p;
|
|
||||||
p = lp->pmdev;
|
|
||||||
p->data = (struct net_device *)dev;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
el3_cards++;
|
el3_cards++;
|
||||||
lp->next_dev = el3_root_dev;
|
lp->next_dev = el3_root_dev;
|
||||||
el3_root_dev = dev;
|
el3_root_dev = dev;
|
||||||
|
@ -1480,20 +1475,17 @@ el3_up(struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Power Management support functions */
|
/* Power Management support functions */
|
||||||
#ifdef CONFIG_PM_LEGACY
|
#ifdef EL3_SUSPEND
|
||||||
|
|
||||||
static int
|
static int
|
||||||
el3_suspend(struct pm_dev *pdev)
|
el3_suspend(struct device *pdev, pm_message_t state)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
struct el3_private *lp;
|
struct el3_private *lp;
|
||||||
int ioaddr;
|
int ioaddr;
|
||||||
|
|
||||||
if (!pdev && !pdev->data)
|
dev = pdev->driver_data;
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
dev = (struct net_device *)pdev->data;
|
|
||||||
lp = netdev_priv(dev);
|
lp = netdev_priv(dev);
|
||||||
ioaddr = dev->base_addr;
|
ioaddr = dev->base_addr;
|
||||||
|
|
||||||
|
@ -1510,17 +1502,14 @@ el3_suspend(struct pm_dev *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
el3_resume(struct pm_dev *pdev)
|
el3_resume(struct device *pdev)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
struct el3_private *lp;
|
struct el3_private *lp;
|
||||||
int ioaddr;
|
int ioaddr;
|
||||||
|
|
||||||
if (!pdev && !pdev->data)
|
dev = pdev->driver_data;
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
dev = (struct net_device *)pdev->data;
|
|
||||||
lp = netdev_priv(dev);
|
lp = netdev_priv(dev);
|
||||||
ioaddr = dev->base_addr;
|
ioaddr = dev->base_addr;
|
||||||
|
|
||||||
|
@ -1536,20 +1525,7 @@ el3_resume(struct pm_dev *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
#endif /* EL3_SUSPEND */
|
||||||
el3_pm_callback(struct pm_dev *pdev, pm_request_t rqst, void *data)
|
|
||||||
{
|
|
||||||
switch (rqst) {
|
|
||||||
case PM_SUSPEND:
|
|
||||||
return el3_suspend(pdev);
|
|
||||||
|
|
||||||
case PM_RESUME:
|
|
||||||
return el3_resume(pdev);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_PM_LEGACY */
|
|
||||||
|
|
||||||
/* Parameters that may be passed into the module. */
|
/* Parameters that may be passed into the module. */
|
||||||
static int debug = -1;
|
static int debug = -1;
|
||||||
|
|
Loading…
Reference in a new issue