|
@@ -62,12 +62,12 @@
|
|
|
|
|
|
u32 temac_ior(struct temac_local *lp, int offset)
|
|
u32 temac_ior(struct temac_local *lp, int offset)
|
|
{
|
|
{
|
|
- return in_be32((u32 *)(lp->regs + offset));
|
|
|
|
|
|
+ return in_be32(lp->regs + offset);
|
|
}
|
|
}
|
|
|
|
|
|
void temac_iow(struct temac_local *lp, int offset, u32 value)
|
|
void temac_iow(struct temac_local *lp, int offset, u32 value)
|
|
{
|
|
{
|
|
- out_be32((u32 *) (lp->regs + offset), value);
|
|
|
|
|
|
+ out_be32(lp->regs + offset, value);
|
|
}
|
|
}
|
|
|
|
|
|
int temac_indirect_busywait(struct temac_local *lp)
|
|
int temac_indirect_busywait(struct temac_local *lp)
|
|
@@ -124,7 +124,7 @@ void temac_indirect_out32(struct temac_local *lp, int reg, u32 value)
|
|
*/
|
|
*/
|
|
static u32 temac_dma_in32(struct temac_local *lp, int reg)
|
|
static u32 temac_dma_in32(struct temac_local *lp, int reg)
|
|
{
|
|
{
|
|
- return in_be32((u32 *)(lp->sdma_regs + (reg << 2)));
|
|
|
|
|
|
+ return in_be32(lp->sdma_regs + (reg << 2));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -134,7 +134,7 @@ static u32 temac_dma_in32(struct temac_local *lp, int reg)
|
|
*/
|
|
*/
|
|
static void temac_dma_out32(struct temac_local *lp, int reg, u32 value)
|
|
static void temac_dma_out32(struct temac_local *lp, int reg, u32 value)
|
|
{
|
|
{
|
|
- out_be32((u32 *)(lp->sdma_regs + (reg << 2)), value);
|
|
|
|
|
|
+ out_be32(lp->sdma_regs + (reg << 2), value);
|
|
}
|
|
}
|
|
|
|
|
|
/* DMA register access functions can be DCR based or memory mapped.
|
|
/* DMA register access functions can be DCR based or memory mapped.
|
|
@@ -400,7 +400,7 @@ static void temac_set_multicast_list(struct net_device *ndev)
|
|
mutex_unlock(&lp->indirect_mutex);
|
|
mutex_unlock(&lp->indirect_mutex);
|
|
}
|
|
}
|
|
|
|
|
|
-struct temac_option {
|
|
|
|
|
|
+static struct temac_option {
|
|
int flg;
|
|
int flg;
|
|
u32 opt;
|
|
u32 opt;
|
|
u32 reg;
|
|
u32 reg;
|
|
@@ -587,7 +587,7 @@ static void temac_device_reset(struct net_device *ndev)
|
|
ndev->trans_start = jiffies; /* prevent tx timeout */
|
|
ndev->trans_start = jiffies; /* prevent tx timeout */
|
|
}
|
|
}
|
|
|
|
|
|
-void temac_adjust_link(struct net_device *ndev)
|
|
|
|
|
|
+static void temac_adjust_link(struct net_device *ndev)
|
|
{
|
|
{
|
|
struct temac_local *lp = netdev_priv(ndev);
|
|
struct temac_local *lp = netdev_priv(ndev);
|
|
struct phy_device *phy = lp->phy_dev;
|
|
struct phy_device *phy = lp->phy_dev;
|