| To: | Jeff Garzik <jgarzik@xxxxxxxxx> |
|---|---|
| Subject: | [PATCH] (addendum) sk98: elimnate AllocFlag |
| From: | Stephen Hemminger <shemminger@xxxxxxxx> |
| Date: | Fri, 19 Nov 2004 11:52:33 -0800 |
| Cc: | Mirko Lindner <demon@xxxxxxxxxxxx>, netdev@xxxxxxxxxxx |
| In-reply-to: | <20041115163616.17dfe933@xxxxxxxxxxxxxxxxx> |
| Organization: | Open Source Development Lab |
| References: | <20041115163616.17dfe933@xxxxxxxxxxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
Don't need AllocFlag in device structure since FreeResources only
called in case where allocation was done.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxx>
diff -Nru a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
--- a/drivers/net/sk98lin/skge.c 2004-11-19 11:49:15 -08:00
+++ b/drivers/net/sk98lin/skge.c 2004-11-19 11:49:15 -08:00
@@ -316,25 +316,13 @@
*/
static void FreeResources(struct net_device *dev)
{
-SK_U32 AllocFlag;
-DEV_NET *pNet;
-SK_AC *pAC;
-
- pNet = netdev_priv(dev);
- pAC = pNet->pAC;
- AllocFlag = pAC->AllocFlag;
- if (pAC->PciDev) {
- pci_release_regions(pAC->PciDev);
- }
- if (AllocFlag & SK_ALLOC_IRQ) {
- free_irq(dev->irq, dev);
- }
- if (pAC->IoBase) {
- iounmap(pAC->IoBase);
- }
- if (pAC->pDescrMem) {
- BoardFreeMem(pAC);
- }
+ DEV_NET *pNet = netdev_priv(dev);
+ SK_AC *pAC = pNet->pAC;
+
+ pci_release_regions(pAC->PciDev);
+ free_irq(dev->irq, dev);
+ iounmap(pAC->IoBase);
+ BoardFreeMem(pAC);
} /* FreeResources */
@@ -559,7 +547,6 @@
dev->irq);
return -EAGAIN;
}
- pAC->AllocFlag |= SK_ALLOC_IRQ;
/* Alloc memory for this board (Mem for RxD/TxD) : */
if(!BoardAllocMem(pAC)) {
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH] (23/25) sk98: eliminate Pnmi scratchpad, Stephen Hemminger |
|---|---|
| Next by Date: | Re: [PATCH] MII bus API for PHY devices, Manfred Spraul |
| Previous by Thread: | [PATCH] (25/25) sk98: change type of DiagModeActive, Stephen Hemminger |
| Next by Thread: | [PATCH] (17/25) sk98: use jiffies not gettimeofday, Stephen Hemminger |
| Indexes: | [Date] [Thread] [Top] [All Lists] |