net: ena: simplify ena_com_update_intr_delay_resolution() (da447b3b) · Commits · 戴 / test

Initialize prev_intr_delay_resolution with ena_dev->intr_delay_resolution unconditionally, since it is initialized with ENA_DEFAULT_INTR_DELAY_RESOLUTION in ena_probe(). This approach makes much more sense than handling errors of not initializing it. Also added unlikely to if condition. Signed-off-by:

Arthur Kiyanovski <akiyano@amazon.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/amazon/ena/ena_com.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -1281,13 +1281,9 @@ static int ena_com_ind_tbl_convert_to_device(struct ena_com_dev *ena_dev)
		static void ena_com_update_intr_delay_resolution(struct ena_com_dev *ena_dev,
		u16 intr_delay_resolution)
		{
		/* Initial value of intr_delay_resolution might be 0 */
		u16 prev_intr_delay_resolution =
		ena_dev->intr_delay_resolution ?
		ena_dev->intr_delay_resolution :
		ENA_DEFAULT_INTR_DELAY_RESOLUTION;
		u16 prev_intr_delay_resolution = ena_dev->intr_delay_resolution;

		if (!intr_delay_resolution) {
		if (unlikely(!intr_delay_resolution)) {
		pr_err("Illegal intr_delay_resolution provided. Going to use default 1 usec resolution\n");
		intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;
		}

Admin message