add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/staging/comedi/drivers/s626.c
..
..
@@ -108,7 +108,6 @@
108
108
 {
109
109
 	unsigned int val = (cmd << 16) | cmd;
110
110
 
111
-	mmiowb();
112
111
 	writel(val, dev->mmio + reg);
113
112
 }
114
113
 
..
..
@@ -116,7 +115,6 @@
116
115
 			    unsigned int cmd, unsigned int reg)
117
116
 {
118
117
 	writel(cmd << 16, dev->mmio + reg);
119
-	mmiowb();
120
118
 }
121
119
 
122
120
 static bool s626_mc_test(struct comedi_device *dev,
..
..
@@ -1894,8 +1892,7 @@
1894
1892
 		if (cmd->scan_begin_src == TRIG_TIMER) {
1895
1893
 			arg = cmd->convert_arg * cmd->scan_end_arg;
1896
1894
 			err |= comedi_check_trigger_arg_min(
1897
-				&cmd->scan_begin_arg,
1898
-				arg);
1895
+					&cmd->scan_begin_arg, arg);
1899
1896
 		}
1900
1897
 	}
1901
1898
 
..
..
@@ -2133,13 +2130,15 @@
2133
2130
 	void *addr;
2134
2131
 	dma_addr_t appdma;
2135
2132
 
2136
-	addr = pci_alloc_consistent(pcidev, S626_DMABUF_SIZE, &appdma);
2133
+	addr = dma_alloc_coherent(&pcidev->dev, S626_DMABUF_SIZE, &appdma,
2134
+				  GFP_KERNEL);
2137
2135
 	if (!addr)
2138
2136
 		return -ENOMEM;
2139
2137
 	devpriv->ana_buf.logical_base = addr;
2140
2138
 	devpriv->ana_buf.physical_base = appdma;
2141
2139
 
2142
-	addr = pci_alloc_consistent(pcidev, S626_DMABUF_SIZE, &appdma);
2140
+	addr = dma_alloc_coherent(&pcidev->dev, S626_DMABUF_SIZE, &appdma,
2141
+				  GFP_KERNEL);
2143
2142
 	if (!addr)
2144
2143
 		return -ENOMEM;
2145
2144
 	devpriv->rps_buf.logical_base = addr;
..
..
@@ -2157,13 +2156,13 @@
2157
2156
 		return;
2158
2157
 
2159
2158
 	if (devpriv->rps_buf.logical_base)
2160
-		pci_free_consistent(pcidev, S626_DMABUF_SIZE,
2161
-				    devpriv->rps_buf.logical_base,
2162
-				    devpriv->rps_buf.physical_base);
2159
+		dma_free_coherent(&pcidev->dev, S626_DMABUF_SIZE,
2160
+				  devpriv->rps_buf.logical_base,
2161
+				  devpriv->rps_buf.physical_base);
2163
2162
 	if (devpriv->ana_buf.logical_base)
2164
-		pci_free_consistent(pcidev, S626_DMABUF_SIZE,
2165
-				    devpriv->ana_buf.logical_base,
2166
-				    devpriv->ana_buf.physical_base);
2163
+		dma_free_coherent(&pcidev->dev, S626_DMABUF_SIZE,
2164
+				  devpriv->ana_buf.logical_base,
2165
+				  devpriv->ana_buf.physical_base);
2167
2166
 }
2168
2167
 
2169
2168
 static int s626_initialize(struct comedi_device *dev)