drivers/char/drm: Array size calculations using sizeof
Subsystems (2)
PATCH 1/1 drivers/char/drm: Array size calculations using sizeof
This patch replaces various array size calculations in drivers/char/drm that were done using sizeof with the ARRAY_SIZE macro.
Tested by compilation on an i386 box using "allyesconfig". Diffed against Linus' git-tree.
Signed-off-by Andi Drebes <[email protected]>
---
drivers/char/drm/via_irq.c +2 -2
@@ -76,8 +76,7 @@ static maskarray_t via_pro_group_a_irqs[] = { {VIA_IRQ_DMA1_TD_ENABLE ,VIA_IRQ_DMA1_TD_PENDING ,VIA_PCI_DMA_CSR1 , VIA_DMA_CSR_TA | VIA_DMA_CSR_TD, 0x00000008}, }; -static int via_num_pro_group_a - sizeof(via_pro_group_a_irqs) / sizeof(maskarray_t); +static int via_num_pro_group_a =ARRAY_SIZE (via_pro_group_a_irqs);static int via_irqmap_pro_group_a[] = {0 ,1 ,-1 ,2 ,-1 ,3 }; static maskarray_t via_unichrome_irqs[] = {
@@ -86,7 +85,7 @@ static maskarray_t via_unichrome_irqs[] = { {VIA_IRQ_DMA1_TD_ENABLE ,VIA_IRQ_DMA1_TD_PENDING ,VIA_PCI_DMA_CSR1 , VIA_DMA_CSR_TA | VIA_DMA_CSR_TD, 0x00000008} }; -static int via_num_unichrome =sizeof (via_unichrome_irqs) /sizeof (maskarray_t); +static int via_num_unichrome =ARRAY_SIZE (via_unichrome_irqs);static int via_irqmap_unichrome[] = {-1 ,-1 ,-1 ,0 ,-1 ,1 };static unsigned time_diff (struct timeval *now,struct timeval *then)
drivers/char/drm/via_verifier.c +3 -3
@@ -1110,9 +1110,9 @@ setup_hazard_table(hz_init_t init_table[], hazard_t table[], int size)void via_init_command_verifier (void ) {setup_hazard_table (init_table1, table1, -sizeof (init_table1) /sizeof (hz_init_t)); +ARRAY_SIZE (init_table1));setup_hazard_table (init_table2, table2, -sizeof (init_table2) /sizeof (hz_init_t)); +ARRAY_SIZE (init_table2));setup_hazard_table (init_table3, table3, -sizeof (init_table3) /sizeof (hz_init_t)); +ARRAY_SIZE (init_table3)); }
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors