@@ -6180,29 +6180,23 @@ static struct dentry *stmmac_fs_dir;
61806180static void sysfs_display_ring (void * head , int size , int extend_desc ,
61816181 struct seq_file * seq , dma_addr_t dma_phy_addr )
61826182{
6183- int i ;
61846183 struct dma_extended_desc * ep = (struct dma_extended_desc * )head ;
61856184 struct dma_desc * p = (struct dma_desc * )head ;
6185+ unsigned int desc_size ;
61866186 dma_addr_t dma_addr ;
6187+ int i ;
61876188
6189+ desc_size = extend_desc ? sizeof (* ep ) : sizeof (* p );
61886190 for (i = 0 ; i < size ; i ++ ) {
6189- if (extend_desc ) {
6190- dma_addr = dma_phy_addr + i * sizeof (* ep );
6191- seq_printf (seq , "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n" ,
6192- i , & dma_addr ,
6193- le32_to_cpu (ep -> basic .des0 ),
6194- le32_to_cpu (ep -> basic .des1 ),
6195- le32_to_cpu (ep -> basic .des2 ),
6196- le32_to_cpu (ep -> basic .des3 ));
6197- ep ++ ;
6198- } else {
6199- dma_addr = dma_phy_addr + i * sizeof (* p );
6200- seq_printf (seq , "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n" ,
6201- i , & dma_addr ,
6202- le32_to_cpu (p -> des0 ), le32_to_cpu (p -> des1 ),
6203- le32_to_cpu (p -> des2 ), le32_to_cpu (p -> des3 ));
6191+ dma_addr = dma_phy_addr + i * desc_size ;
6192+ seq_printf (seq , "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n" ,
6193+ i , & dma_addr ,
6194+ le32_to_cpu (p -> des0 ), le32_to_cpu (p -> des1 ),
6195+ le32_to_cpu (p -> des2 ), le32_to_cpu (p -> des3 ));
6196+ if (extend_desc )
6197+ p = & (++ ep )-> basic ;
6198+ else
62046199 p ++ ;
6205- }
62066200 }
62076201}
62086202
0 commit comments