tgupdate: merge t/upstream base into t/upstream

Author: matttbe

.mailmap

@@ -88,7 +88,6 @@ Antonio Quartulli <[email protected]> <[email protected]>
 Antonio Quartulli <[email protected]> <[email protected]>
 Antonio Quartulli <[email protected]> <[email protected]>
 Antonio Quartulli <[email protected]> <[email protected]>
-Antonio Quartulli <[email protected]> <[email protected]>
 Antonio Quartulli <[email protected]> <[email protected]>
 Anup Patel <[email protected]> <[email protected]>
 Archit Taneja <[email protected]>

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c

@@ -11,6 +11,8 @@
 #include "dwmac_dma.h"
 #include "dwmac1000.h"
 
+#define DRIVER_NAME "dwmac-loongson-pci"
+
 /* Normal Loongson Tx Summary */
 #define DMA_INTR_ENA_NIE_TX_LOONGSON	0x00040000
 /* Normal Loongson Rx Summary */
@@ -567,7 +569,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
 	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
 		if (pci_resource_len(pdev, i) == 0)
 			continue;
-		ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));
+		ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME);
 		if (ret)
 			goto err_disable_device;
 		break;
@@ -689,7 +691,7 @@ static const struct pci_device_id loongson_dwmac_id_table[] = {
 MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);
 
 static struct pci_driver loongson_dwmac_driver = {
-	.name = "dwmac-loongson-pci",
+	.name = DRIVER_NAME,
 	.id_table = loongson_dwmac_id_table,
 	.probe = loongson_dwmac_probe,
 	.remove = loongson_dwmac_remove,