From: David S. Miller Date: Mon, 11 May 2020 20:31:49 +0000 (-0700) Subject: Merge branch 'sfc-remove-nic_data-usage-in-common-code' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9b1b31d5d4ac7d931c3d7e0e8114ff9d4fbd0c28;p=linux.git Merge branch 'sfc-remove-nic_data-usage-in-common-code' Edward Cree says: ==================== sfc: remove nic_data usage in common code efx->nic_data should only be used from NIC-specific code (i.e. nic_type functions and things they call), in files like ef10[_sriov].c and siena.c. This series refactors several nic_data usages from common code (mainly in mcdi_filters.c) into nic_type functions, in preparation for the upcoming ef100 driver which will use those functions but have its own struct layout for efx->nic_data distinct from ef10's. After this series, one nic_data usage (in ptp.c) remains; it wasn't clear to me how to fix it, and ef100 devices don't yet have PTP support (so the initial ef100 driver will not call that code). ==================== Signed-off-by: David S. Miller --- 9b1b31d5d4ac7d931c3d7e0e8114ff9d4fbd0c28