On Tuesday 23 September 2014 20:51:27 Iyappan Subramanian wrote:
> -static void xgene_enet_wr_mcx_mac(struct xgene_enet_pdata *pdata,
> - u32 wr_addr, u32 wr_data)
> +void xgene_enet_wr_mac(struct xgene_enet_pdata *pdata, u32 wr_addr, u32 wr_data)
> {
> void __iomem *addr, *wr, *cmd, *cmd_done;
>
> - addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
> - wr = pdata->mcx_mac_addr + MAC_WRITE_REG_OFFSET;
> - cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
> - cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
> + addr = pdata->mac_addr + MAC_ADDR_REG_OFFSET;
> + wr = pdata->mac_addr + MAC_WRITE_REG_OFFSET;
> + cmd = pdata->mac_addr + MAC_COMMAND_REG_OFFSET;
> + cmd_done = pdata->mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
>
> if (!xgene_enet_wr_indirect(addr, wr, cmd, cmd_done, wr_addr, wr_data))
> netdev_err(pdata->ndev, "MCX mac write failed, addr: %04x\n",
> wr_addr);
> }
>
> -static void xgene_enet_rd_csr(struct xgene_enet_pdata *pdata,
> - u32 offset, u32 *val)
> +void xgene_enet_rd_csr(struct xgene_enet_pdata *pdata, u32 offset, u32 *val)
> {
> void __iomem *addr = pdata->eth_csr_addr + offset;
>
>
A lot of the changes in this patch seem to just rename existing interfaces.
Please split those out into a preparatory patch, to make it easier to
review the actual functional changes.
Arnd
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
