瀏覽代碼

sfc: Use a more sensible cast in efx_rx_buf_offset()

This function returns the page offset of the buffer, which can be
calculated based on either its DMA address or its virtual address.  It
used to use the virtual address and we would cast that to unsigned
long, as anything smaller would result in a compiler warning.  Now
that it's using the DMA address we should use unsigned int, matching
the return type.  It is also unnecessary to use __force.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Ben Hutchings 13 年之前
父節點
當前提交
06e63c57ac
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/net/ethernet/sfc/rx.c

+ 1 - 1
drivers/net/ethernet/sfc/rx.c

@@ -98,7 +98,7 @@ static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx,
 	/* Offset is always within one page, so we don't need to consider
 	/* Offset is always within one page, so we don't need to consider
 	 * the page order.
 	 * the page order.
 	 */
 	 */
-	return ((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) +
+	return ((unsigned int) buf->dma_addr & (PAGE_SIZE - 1)) +
 		efx->type->rx_buffer_hash_size;
 		efx->type->rx_buffer_hash_size;
 }
 }
 static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
 static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)