From: jacliburn@bellsouth.net
To: jeff@garzik.org
Cc: csnook@redhat.com, linux-kernel@vger.kernel.org,
atl1-devel@lists.sourceforge.net,
Jay Cliburn <jacliburn@bellsouth.net>
Subject: [PATCH 23/26] atl1: update shutdown and remove functions
Date: Mon, 31 Dec 2007 20:00:01 -0600 [thread overview]
Message-ID: <1199152804-3889-24-git-send-email-jacliburn@bellsouth.net> (raw)
In-Reply-To: <1199152804-3889-1-git-send-email-jacliburn@bellsouth.net>
From: Jay Cliburn <jacliburn@bellsouth.net>
Update shutdown and remove functions to conform with the current vendor
driver version 1.2.40.2.
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
---
drivers/net/atlx/atl1.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index f09928d..b89201e 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2591,6 +2591,16 @@ static int atl1_close(struct net_device *netdev)
return 0;
}
+static void atl1_force_ps(struct atl1_hw *hw)
+{
+ atl1_write_phy_reg(hw, MII_DBG_ADDR, 0);
+ atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E);
+ atl1_write_phy_reg(hw, MII_DBG_ADDR, 2);
+ atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000);
+ atl1_write_phy_reg(hw, MII_DBG_ADDR, 3);
+ atl1_write_phy_reg(hw, MII_DBG_DATA, 0);
+}
+
#ifdef CONFIG_PM
static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
{
@@ -2878,12 +2888,7 @@ err_request_regions:
static void __devexit atl1_remove(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
- struct atl1_adapter *adapter;
- /* Device not available. Return. */
- if (!netdev)
- return;
-
- adapter = netdev_priv(netdev);
+ struct atl1_adapter *adapter = netdev_priv(netdev);
/*
* Some atl1 boards lack persistent storage for their MAC, and get it
@@ -2896,21 +2901,31 @@ static void __devexit atl1_remove(struct pci_dev *pdev)
atl1_set_mac_addr(&adapter->hw);
}
- iowrite16(0, adapter->hw.hw_addr + REG_PHY_ENABLE);
+ set_bit(__ATL1_DOWN, &adapter->flags);
+ del_timer_sync(&adapter->watchdog_timer);
+ del_timer_sync(&adapter->phy_config_timer);
+ flush_scheduled_work();
unregister_netdev(netdev);
+ atl1_force_ps(&adapter->hw);
pci_iounmap(pdev, adapter->hw.hw_addr);
pci_release_regions(pdev);
free_netdev(netdev);
pci_disable_device(pdev);
}
+static void atl1_shutdown(struct pci_dev *pdev)
+{
+ atl1_suspend(pdev, PMSG_SUSPEND);
+}
+
static struct pci_driver atl1_driver = {
.name = ATLX_DRIVER_NAME,
.id_table = atl1_pci_tbl,
.probe = atl1_probe,
.remove = __devexit_p(atl1_remove),
.suspend = atl1_suspend,
- .resume = atl1_resume
+ .resume = atl1_resume,
+ .shutdown = atl1_shutdown
};
/*
--
1.5.3.3
next prev parent reply other threads:[~2008-01-01 2:09 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-01 1:59 [PATCH 00/26] atl1: divide and modernize jacliburn
2008-01-01 1:59 ` [PATCH 01/26] atl1: relocate atl1 driver to /drivers/net/atlx jacliburn
2008-01-01 1:59 ` [PATCH 02/26] atl1: move common functions to atlx files jacliburn
2008-01-01 1:59 ` [PATCH 03/26] atl1: fix broken TSO jacliburn
2008-01-01 1:59 ` [PATCH 04/26] atl1: add ethtool register dump jacliburn
2008-01-22 9:54 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 05/26] atl1: print debug info if rrd error jacliburn
2008-01-22 9:55 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 06/26] atl1: update initialization parameters jacliburn
2008-01-22 9:56 ` Jeff Garzik
2008-01-23 2:13 ` Jay Cliburn
2008-01-23 2:19 ` Jeff Garzik
2008-01-23 2:30 ` Chris Snook
2008-01-01 1:59 ` [PATCH 07/26] atl1: clarify max rx frame size jacliburn
2008-01-01 1:59 ` [PATCH 08/26] atl1: additional DMA engine configuration jacliburn
2008-01-01 1:59 ` [PATCH 09/26] atl1: refactor tx processing jacliburn
2008-01-22 9:58 ` Jeff Garzik
2008-01-23 0:31 ` Jay Cliburn
2008-01-25 1:00 ` Jay Cliburn
2008-01-25 1:08 ` Chris Snook
2008-01-25 3:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 10/26] atl1: use csum_start jacliburn
2008-01-01 1:59 ` [PATCH 11/26] atl1: refactor initialization and startup jacliburn
2008-01-01 1:59 ` [PATCH 12/26] atl1: refactor atl1_probe jacliburn
2008-01-01 1:59 ` [PATCH 13/26] atl1: refactor interrupt handling jacliburn
2008-01-22 9:59 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 14/26] atl1: move stray defines to header file jacliburn
2008-01-01 1:59 ` [PATCH 15/26] atl1: tidy up ring management jacliburn
2008-01-01 1:59 ` [PATCH 16/26] atl1: modernize check link function jacliburn
2008-01-01 1:59 ` [PATCH 17/26] atl1: update phy config function jacliburn
2008-01-01 1:59 ` [PATCH 18/26] atl1: make function static jacliburn
2008-01-01 1:59 ` [PATCH 19/26] atl1: modernize down/up functions jacliburn
2008-01-22 10:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 20/26] atl1: update change mtu jacliburn
2008-01-01 1:59 ` [PATCH 21/26] atl1: update atl1_close jacliburn
2008-01-01 2:00 ` [PATCH 22/26] atl1: update netpoll jacliburn
2008-01-01 2:00 ` jacliburn [this message]
2008-01-01 2:00 ` [PATCH 24/26] atl1: update wake-on-lan jacliburn
2008-01-01 2:00 ` [PATCH 25/26] atl1: add NAPI support jacliburn
2008-01-01 6:09 ` Joonwoo Park
2008-01-01 18:15 ` [PATCH 25/26] [REVISED] " Jay Cliburn
2008-01-02 2:56 ` Joonwoo Park
2008-01-02 3:07 ` David Miller
2008-01-01 2:00 ` [PATCH 26/26] atl1: remove experimental tag and clean up comments jacliburn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1199152804-3889-24-git-send-email-jacliburn@bellsouth.net \
--to=jacliburn@bellsouth.net \
--cc=atl1-devel@lists.sourceforge.net \
--cc=csnook@redhat.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).