diff options
| author |   Michael Ellerman <michael@ellerman.id.au> | 2007-10-15 19:34:34 +1000 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-10-15 14:29:49 -0400 |
| commit | 792036952123a0670c7dd6960ca5458cdfd5e4fd (patch) | |
| tree | a9a67cca154acddc467e504c796fa72390ba7cc6 /drivers/net/ibm_newemac/mal.h | |
| parent | tehuti: possible leak in bdx_probe (diff) | |
| download | linux-dev-792036952123a0670c7dd6960ca5458cdfd5e4fd.tar.xz linux-dev-792036952123a0670c7dd6960ca5458cdfd5e4fd.zip | |
Update ibm_newemac to use dcr_host_t.base
Now that dcr_host_t contains the base address, we can use that in the
ibm_newemac code, rather than storing it separately.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ibm_newemac/mal.h')
| -rw-r--r-- | drivers/net/ibm_newemac/mal.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h index cb1a16d589fe..6daa98e5992e 100644 --- a/drivers/net/ibm_newemac/mal.h +++ b/drivers/net/ibm_newemac/mal.h @@ -185,7 +185,6 @@ struct mal_commac { struct mal_instance { int version; - int dcr_base; dcr_host_t dcr_host; int num_tx_chans; /* Number of TX channels */ @@ -213,12 +212,12 @@ struct mal_instance { static inline u32 get_mal_dcrn(struct mal_instance *mal, int reg) { - return dcr_read(mal->dcr_host, mal->dcr_base + reg); + return dcr_read(mal->dcr_host, mal->dcr_host.base + reg); } static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val) { - dcr_write(mal->dcr_host, mal->dcr_base + reg, val); + dcr_write(mal->dcr_host, mal->dcr_host.base + reg, val); } /* Register MAL devices */ |