drivers: use PCI registration macro

[dpdk.git] / drivers / net / szedata2 / rte_eth_szedata2.c

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index 1d6a600..9302200 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -62,7 +62,7 @@
  */
 #define RTE_SZE2_PACKET_HEADER_SIZE_ALIGNED 8
 
-#define RTE_SZEDATA2_DRIVER_NAME "rte_szedata2_pmd"
+#define RTE_SZEDATA2_DRIVER_NAME net_szedata2
 #define RTE_SZEDATA2_PCI_DRIVER_NAME "rte_szedata2_pmd"
 
 #define SZEDATA2_DEV_PATH_FMT "/dev/szedataII%u"
@@ -1036,6 +1036,7 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->max_rx_queues = internals->max_rx_queues;
        dev_info->max_tx_queues = internals->max_tx_queues;
        dev_info->min_rx_bufsize = 0;
+       dev_info->speed_capa = ETH_LINK_SPEED_100G;
 }
 
 static void
@@ -1149,22 +1150,16 @@ eth_link_update(struct rte_eth_dev *dev,
 
        switch (cgmii_link_speed(ibuf)) {
        case SZEDATA2_LINK_SPEED_10G:
-               link.link_speed = ETH_LINK_SPEED_10G;
+               link.link_speed = ETH_SPEED_NUM_10G;
                break;
        case SZEDATA2_LINK_SPEED_40G:
-               link.link_speed = ETH_LINK_SPEED_40G;
+               link.link_speed = ETH_SPEED_NUM_40G;
                break;
        case SZEDATA2_LINK_SPEED_100G:
-               /*
-                * TODO
-                * If link_speed value from rte_eth_link structure
-                * will be changed to support 100Gbps speed change
-                * this value to 100G.
-                */
-               link.link_speed = ETH_LINK_SPEED_10G;
+               link.link_speed = ETH_SPEED_NUM_100G;
                break;
        default:
-               link.link_speed = ETH_LINK_SPEED_10G;
+               link.link_speed = ETH_SPEED_NUM_10G;
                break;
        }
 
@@ -1172,7 +1167,9 @@ eth_link_update(struct rte_eth_dev *dev,
        link.link_duplex = ETH_LINK_FULL_DUPLEX;
 
        link.link_status = (cgmii_ibuf_is_enabled(ibuf) &&
-                       cgmii_ibuf_is_link_up(ibuf)) ? 1 : 0;
+                       cgmii_ibuf_is_link_up(ibuf)) ? ETH_LINK_UP : ETH_LINK_DOWN;
+
+       link.link_autoneg = ETH_LINK_SPEED_FIXED;
 
        rte_atomic64_cmpset((uint64_t *)dev_link, *(uint64_t *)dev_link,
                        *(uint64_t *)link_ptr);
@@ -1484,7 +1481,7 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev)
                return -EINVAL;
        }
        snprintf(rsc_filename, PATH_MAX,
-               SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/resource%u",
+               "%s/" PCI_PRI_FMT "/resource%u", pci_get_sysfs_path(),
                pci_addr->domain, pci_addr->bus,
                pci_addr->devid, pci_addr->function, PCI_RESOURCE_NUMBER);
        fd = open(rsc_filename, O_RDWR);
@@ -1577,31 +1574,13 @@ static struct eth_driver szedata2_eth_driver = {
        .pci_drv = {
                .name     = RTE_SZEDATA2_PCI_DRIVER_NAME,
                .id_table = rte_szedata2_pci_id_table,
+               .probe = rte_eth_dev_pci_probe,
+               .remove = rte_eth_dev_pci_remove,
        },
        .eth_dev_init     = rte_szedata2_eth_dev_init,
        .eth_dev_uninit   = rte_szedata2_eth_dev_uninit,
        .dev_private_size = sizeof(struct pmd_internals),
 };
 
-static int
-rte_szedata2_init(const char *name __rte_unused,
-               const char *args __rte_unused)
-{
-       rte_eth_driver_register(&szedata2_eth_driver);
-       return 0;
-}
-
-static int
-rte_szedata2_uninit(const char *name __rte_unused)
-{
-       return 0;
-}
-
-static struct rte_driver rte_szedata2_driver = {
-       .type = PMD_PDEV,
-       .name = RTE_SZEDATA2_DRIVER_NAME,
-       .init = rte_szedata2_init,
-       .uninit = rte_szedata2_uninit,
-};
-
-PMD_REGISTER_DRIVER(rte_szedata2_driver);
+DRIVER_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv);
+DRIVER_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table);