svn commit: r355390 - stable/12/sys/dev/ntb/ntb_hw

[Alexander Motin]

Author: mav
Date: Wed Dec  4 15:12:09 2019
New Revision: 355390
URL: https://svnweb.freebsd.org/changeset/base/355390

Log:
  MFC r355163: Make the code slightly more compact.
  
  There should be no functional change.

Modified:
  stable/12/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
==============================================================================
--- stable/12/sys/dev/ntb/ntb_hw/ntb_hw_intel.c	Wed Dec  4 15:11:42 2019	(r355389)
+++ stable/12/sys/dev/ntb/ntb_hw/ntb_hw_intel.c	Wed Dec  4 15:12:09 2019	(r355390)
@@ -781,37 +781,42 @@ bar_get_xlat_params(struct ntb_softc *ntb, enum ntb_ba
 static int
 intel_ntb_map_pci_bars(struct ntb_softc *ntb)
 {
+	struct ntb_pci_bar_info *bar;
 	int rc;
 
-	ntb->bar_info[NTB_CONFIG_BAR].pci_resource_id = PCIR_BAR(0);
-	rc = map_mmr_bar(ntb, &ntb->bar_info[NTB_CONFIG_BAR]);
+	bar = &ntb->bar_info[NTB_CONFIG_BAR];
+	bar->pci_resource_id = PCIR_BAR(0);
+	rc = map_mmr_bar(ntb, bar);
 	if (rc != 0)
 		goto out;
 
-	ntb->bar_info[NTB_B2B_BAR_1].pci_resource_id = PCIR_BAR(2);
-	rc = map_memory_window_bar(ntb, &ntb->bar_info[NTB_B2B_BAR_1]);
+	bar = &ntb->bar_info[NTB_B2B_BAR_1];
+	bar->pci_resource_id = PCIR_BAR(2);
+	rc = map_memory_window_bar(ntb, bar);
 	if (rc != 0)
 		goto out;
-	ntb->bar_info[NTB_B2B_BAR_1].psz_off = XEON_PBAR23SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_1].ssz_off = XEON_SBAR23SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_1].pbarxlat_off = XEON_PBAR2XLAT_OFFSET;
+	bar->psz_off = XEON_PBAR23SZ_OFFSET;
+	bar->ssz_off = XEON_SBAR23SZ_OFFSET;
+	bar->pbarxlat_off = XEON_PBAR2XLAT_OFFSET;
 
-	ntb->bar_info[NTB_B2B_BAR_2].pci_resource_id = PCIR_BAR(4);
-	rc = map_memory_window_bar(ntb, &ntb->bar_info[NTB_B2B_BAR_2]);
+	bar = &ntb->bar_info[NTB_B2B_BAR_2];
+	bar->pci_resource_id = PCIR_BAR(4);
+	rc = map_memory_window_bar(ntb, bar);
 	if (rc != 0)
 		goto out;
-	ntb->bar_info[NTB_B2B_BAR_2].psz_off = XEON_PBAR4SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_2].ssz_off = XEON_SBAR4SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_2].pbarxlat_off = XEON_PBAR4XLAT_OFFSET;
+	bar->psz_off = XEON_PBAR4SZ_OFFSET;
+	bar->ssz_off = XEON_SBAR4SZ_OFFSET;
+	bar->pbarxlat_off = XEON_PBAR4XLAT_OFFSET;
 
 	if (!HAS_FEATURE(ntb, NTB_SPLIT_BAR))
 		goto out;
 
-	ntb->bar_info[NTB_B2B_BAR_3].pci_resource_id = PCIR_BAR(5);
-	rc = map_memory_window_bar(ntb, &ntb->bar_info[NTB_B2B_BAR_3]);
-	ntb->bar_info[NTB_B2B_BAR_3].psz_off = XEON_PBAR5SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_3].ssz_off = XEON_SBAR5SZ_OFFSET;
-	ntb->bar_info[NTB_B2B_BAR_3].pbarxlat_off = XEON_PBAR5XLAT_OFFSET;
+	bar = &ntb->bar_info[NTB_B2B_BAR_3];
+	bar->pci_resource_id = PCIR_BAR(5);
+	rc = map_memory_window_bar(ntb, bar);
+	bar->psz_off = XEON_PBAR5SZ_OFFSET;
+	bar->ssz_off = XEON_SBAR5SZ_OFFSET;
+	bar->pbarxlat_off = XEON_PBAR5XLAT_OFFSET;
 
 out:
 	if (rc != 0)
@@ -934,15 +939,14 @@ map_memory_window_bar(struct ntb_softc *ntb, struct nt
 static void
 intel_ntb_unmap_pci_bar(struct ntb_softc *ntb)
 {
-	struct ntb_pci_bar_info *current_bar;
+	struct ntb_pci_bar_info *bar;
 	int i;
 
 	for (i = 0; i < NTB_MAX_BARS; i++) {
-		current_bar = &ntb->bar_info[i];
-		if (current_bar->pci_resource != NULL)
+		bar = &ntb->bar_info[i];
+		if (bar->pci_resource != NULL)
 			bus_release_resource(ntb->device, SYS_RES_MEMORY,
-			    current_bar->pci_resource_id,
-			    current_bar->pci_resource);
+			    bar->pci_resource_id, bar->pci_resource);
 	}
 }