cfi_flash: Fix whitespace with casting

[u-boot] / drivers / net / xilinx_ll_temac.c

diff --git a/drivers/net/xilinx_ll_temac.c b/drivers/net/xilinx_ll_temac.c
index dab78d073dab6185ec5445617185f794c437f5b9..1e7e2e49af9c118f5d3e4d410ef65e16b78ac1ac 100644 (file)
--- a/drivers/net/xilinx_ll_temac.c
+++ b/drivers/net/xilinx_ll_temac.c
@@ -231,7 +231,7 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis)
        struct ll_temac *ll_temac = dev->priv;
        int ret;
 
-       printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n",
+       printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08lx.\n",
                dev->name, dev->index, dev->iobase);
 
        if (!ll_temac_setup_ctrl(dev))
@@ -303,7 +303,8 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
        if (devinf->devname) {
                strncpy(dev->name, devinf->devname, sizeof(dev->name));
        } else {
-               snprintf(dev->name, sizeof(dev->name), "lltemac.%lx", devinf->base_addr);
+               snprintf(dev->name, sizeof(dev->name), "ll_tem.%lx",
+                        devinf->base_addr);
                devinf->devname = dev->name;
        }
 
@@ -316,18 +317,9 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 
        ll_temac->ctrladdr = devinf->ctrl_addr;
        if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_PLB) {
-#if defined(CONFIG_XILINX_440) || defined(CONFIG_XILINX_405)
-               if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_DCR) {
-                       ll_temac_collect_xldcr_sdma_reg_addr(dev);
-                       ll_temac->in32 = ll_temac_xldcr_in32;
-                       ll_temac->out32 = ll_temac_xldcr_out32;
-               } else
-#endif
-               {
-                       ll_temac_collect_xlplb_sdma_reg_addr(dev);
-                       ll_temac->in32 = ll_temac_xlplb_in32;
-                       ll_temac->out32 = ll_temac_xlplb_out32;
-               }
+               ll_temac_collect_xlplb_sdma_reg_addr(dev);
+               ll_temac->in32 = ll_temac_xlplb_in32;
+               ll_temac->out32 = ll_temac_xlplb_out32;
                ll_temac->ctrlinit = ll_temac_init_sdma;
                ll_temac->ctrlhalt = ll_temac_halt_sdma;
                ll_temac->ctrlreset = ll_temac_reset_sdma;