diff options
author | françois romieu <romieu@fr.zoreil.com> | 2012-03-15 21:52:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-17 02:13:20 -0400 |
commit | 126a3fd251b244eabd9ab9dcb32b8b6f999c1b91 (patch) | |
tree | db496f9ba4536215e9be58745565a426c090aebb /drivers/atm/eni.h | |
parent | 4823cd388dd68015e254d1449bd63ffe47d83fa7 (diff) |
eni: fix driver remove function and driver probe error path.
- add eni_do_release() to balance eni_do_init
- turn the zeroes DMA area into a per device data
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/eni.h')
-rw-r--r-- | drivers/atm/eni.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h index dc9a62cc2605..565e53a5cb78 100644 --- a/drivers/atm/eni.h +++ b/drivers/atm/eni.h | |||
@@ -72,6 +72,7 @@ struct eni_dev { | |||
72 | u32 events; /* pending events */ | 72 | u32 events; /* pending events */ |
73 | /*-------------------------------- base pointers into Midway address | 73 | /*-------------------------------- base pointers into Midway address |
74 | space */ | 74 | space */ |
75 | void __iomem *ioaddr; | ||
75 | void __iomem *phy; /* PHY interface chip registers */ | 76 | void __iomem *phy; /* PHY interface chip registers */ |
76 | void __iomem *reg; /* register base */ | 77 | void __iomem *reg; /* register base */ |
77 | void __iomem *ram; /* RAM base */ | 78 | void __iomem *ram; /* RAM base */ |
@@ -86,6 +87,10 @@ struct eni_dev { | |||
86 | wait_queue_head_t tx_wait; /* for close */ | 87 | wait_queue_head_t tx_wait; /* for close */ |
87 | int tx_bw; /* remaining bandwidth */ | 88 | int tx_bw; /* remaining bandwidth */ |
88 | u32 dma[TX_DMA_BUF*2]; /* DMA request scratch area */ | 89 | u32 dma[TX_DMA_BUF*2]; /* DMA request scratch area */ |
90 | struct eni_zero { /* aligned "magic" zeroes */ | ||
91 | u32 *addr; | ||
92 | dma_addr_t dma; | ||
93 | } zero; | ||
89 | int tx_mult; /* buffer size multiplier (percent) */ | 94 | int tx_mult; /* buffer size multiplier (percent) */ |
90 | /*-------------------------------- RX part */ | 95 | /*-------------------------------- RX part */ |
91 | u32 serv_read; /* host service read index */ | 96 | u32 serv_read; /* host service read index */ |