Commit bbbd7303 authored by Raju Rangoju's avatar Raju Rangoju Committed by Paolo Abeni
Browse files

amd-xgbe: reorganize the xgbe_pci_probe() code path 



Reorganize the xgbe_pci_probe() code path to convert if/else statements
to switch case to help add future code. This helps code look cleaner.

Signed-off-by: default avatarRaju Rangoju <Raju.Rangoju@amd.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250509155325.720499-3-Raju.Rangoju@amd.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 2d440716

drivers/net/ethernet/amd/xgbe/xgbe-pci.c

+21 −14
Original line number Diff line number Diff line
@@ -165,12 +165,13 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	/* Set the PCS indirect addressing definition registers */

	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (rdev &&

	    (rdev->vendor == PCI_VENDOR_ID_AMD) && (rdev->device == 0x15d0)) {

	if (rdev && rdev->vendor == PCI_VENDOR_ID_AMD) {

		switch (rdev->device) {

		case XGBE_RV_PCI_DEVICE_ID:

			pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;

			pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;

	} else if (rdev && (rdev->vendor == PCI_VENDOR_ID_AMD) &&

		   (rdev->device == 0x14b5)) {

			break;

		case XGBE_YC_PCI_DEVICE_ID:

			pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;

			pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;
@@ -179,6 +180,12 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


			/* Yellow Carp devices do not need rrc */

			pdata->vdata->enable_rrc = 0;

			break;

		default:

			pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;

			pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;

			break;

		}

	} else {

		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;

		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;

drivers/net/ethernet/amd/xgbe/xgbe.h

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ 
		    (_src)->link_modes._sname,		\

		    __ETHTOOL_LINK_MODE_MASK_NBITS)



/* XGBE PCI device id */

#define XGBE_RV_PCI_DEVICE_ID	0x15d0

#define XGBE_YC_PCI_DEVICE_ID	0x14b5



struct xgbe_prv_data;



struct xgbe_packet_data {