Staging: et131x: Kill MAC_STAT_t
All the contents of this type are now clean, so kill the top level type as well Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
461e0e8b15
commit
dc26ffc772
|
@ -1464,8 +1464,9 @@ typedef struct _MAC_t { /* Location: */
|
||||||
/*
|
/*
|
||||||
* MAC STATS Module of JAGCore Address Mapping
|
* MAC STATS Module of JAGCore Address Mapping
|
||||||
*/
|
*/
|
||||||
typedef struct _MAC_STAT_t { /* Location: */
|
struct macstat_regs
|
||||||
u32 pad[32]; /* 0x6000 - 607C */
|
{ /* Location: */
|
||||||
|
u32 pad[32]; /* 0x6000 - 607C */
|
||||||
|
|
||||||
/* Tx/Rx 0-64 Byte Frame Counter */
|
/* Tx/Rx 0-64 Byte Frame Counter */
|
||||||
u32 TR64; /* 0x6080 */
|
u32 TR64; /* 0x6080 */
|
||||||
|
@ -1610,7 +1611,7 @@ typedef struct _MAC_STAT_t { /* Location: */
|
||||||
|
|
||||||
/* Carry Register Two Mask Register */
|
/* Carry Register Two Mask Register */
|
||||||
u32 Carry2M; /* 0x613C */
|
u32 Carry2M; /* 0x613C */
|
||||||
} MAC_STAT_t, *PMAC_STAT_t;
|
};
|
||||||
|
|
||||||
/* END OF MAC STAT REGISTER ADDRESS MAP */
|
/* END OF MAC STAT REGISTER ADDRESS MAP */
|
||||||
|
|
||||||
|
@ -1682,9 +1683,9 @@ typedef struct _ADDRESS_MAP_t {
|
||||||
MAC_t mac;
|
MAC_t mac;
|
||||||
/* unused section of mac address map */
|
/* unused section of mac address map */
|
||||||
u8 unused_mac[4096 - sizeof(MAC_t)];
|
u8 unused_mac[4096 - sizeof(MAC_t)];
|
||||||
MAC_STAT_t macStat;
|
struct macstat_regs macstat;
|
||||||
/* unused section of mac stat address map */
|
/* unused section of mac stat address map */
|
||||||
u8 unused_mac_stat[4096 - sizeof(MAC_STAT_t)];
|
u8 unused_mac_stat[4096 - sizeof(struct macstat_regs)];
|
||||||
struct mmc_regs mmc;
|
struct mmc_regs mmc;
|
||||||
/* unused section of mmc address map */
|
/* unused section of mmc address map */
|
||||||
u8 unused_mmc[4096 - sizeof(struct mmc_regs)];
|
u8 unused_mmc[4096 - sizeof(struct mmc_regs)];
|
||||||
|
|
|
@ -384,8 +384,8 @@ void ConfigTxMacRegs(struct et131x_adapter *etdev)
|
||||||
|
|
||||||
void ConfigMacStatRegs(struct et131x_adapter *etdev)
|
void ConfigMacStatRegs(struct et131x_adapter *etdev)
|
||||||
{
|
{
|
||||||
struct _MAC_STAT_t __iomem *macstat =
|
struct macstat_regs __iomem *macstat =
|
||||||
&etdev->regs->macStat;
|
&etdev->regs->macstat;
|
||||||
|
|
||||||
/* Next we need to initialize all the MAC_STAT registers to zero on
|
/* Next we need to initialize all the MAC_STAT registers to zero on
|
||||||
* the device.
|
* the device.
|
||||||
|
@ -456,8 +456,8 @@ void ConfigFlowControl(struct et131x_adapter *etdev)
|
||||||
void UpdateMacStatHostCounters(struct et131x_adapter *etdev)
|
void UpdateMacStatHostCounters(struct et131x_adapter *etdev)
|
||||||
{
|
{
|
||||||
struct _ce_stats_t *stats = &etdev->Stats;
|
struct _ce_stats_t *stats = &etdev->Stats;
|
||||||
struct _MAC_STAT_t __iomem *macstat =
|
struct macstat_regs __iomem *macstat =
|
||||||
&etdev->regs->macStat;
|
&etdev->regs->macstat;
|
||||||
|
|
||||||
stats->collisions += readl(&macstat->TNcl);
|
stats->collisions += readl(&macstat->TNcl);
|
||||||
stats->first_collision += readl(&macstat->TScl);
|
stats->first_collision += readl(&macstat->TScl);
|
||||||
|
@ -493,11 +493,11 @@ void HandleMacStatInterrupt(struct et131x_adapter *etdev)
|
||||||
/* Read the interrupt bits from the register(s). These are Clear On
|
/* Read the interrupt bits from the register(s). These are Clear On
|
||||||
* Write.
|
* Write.
|
||||||
*/
|
*/
|
||||||
Carry1 = readl(&etdev->regs->macStat.Carry1);
|
Carry1 = readl(&etdev->regs->macstat.Carry1);
|
||||||
Carry2 = readl(&etdev->regs->macStat.Carry2);
|
Carry2 = readl(&etdev->regs->macstat.Carry2);
|
||||||
|
|
||||||
writel(Carry1, &etdev->regs->macStat.Carry1);
|
writel(Carry1, &etdev->regs->macstat.Carry1);
|
||||||
writel(Carry2, &etdev->regs->macStat.Carry2);
|
writel(Carry2, &etdev->regs->macstat.Carry2);
|
||||||
|
|
||||||
/* We need to do update the host copy of all the MAC_STAT counters.
|
/* We need to do update the host copy of all the MAC_STAT counters.
|
||||||
* For each counter, check it's overflow bit. If the overflow bit is
|
* For each counter, check it's overflow bit. If the overflow bit is
|
||||||
|
|
Loading…
Reference in a new issue