sfc/siena: Make PTP and reset support specific for Siena

Change the clock name and work queue names to differentiate them from
the names used in sfc.ko.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/sfc/siena/efx_common.c b/drivers/net/ethernet/sfc/siena/efx_common.c
index a615bffcbad4ed61164247c71adcf4d731d5c194..954daf464abbdcd5ddd980b95c64afa282bcc085 100644 (file)
--- a/drivers/net/ethernet/sfc/siena/efx_common.c
+++ b/drivers/net/ethernet/sfc/siena/efx_common.c
@@ -112,7 +112,7 @@ static struct workqueue_struct *reset_workqueue;
 
 int efx_siena_create_reset_workqueue(void)
 {
-       reset_workqueue = create_singlethread_workqueue("sfc_reset");
+       reset_workqueue = create_singlethread_workqueue("sfc_siena_reset");
        if (!reset_workqueue) {
                printk(KERN_ERR "Failed to create reset workqueue\n");
                return -ENOMEM;

diff --git a/drivers/net/ethernet/sfc/siena/ptp.c b/drivers/net/ethernet/sfc/siena/ptp.c
index 8e18da096595781f95de03445cabe29cec06b3ae..7c46752e6eae86ff104bd2a7226c08d2eeb45e7d 100644 (file)
--- a/drivers/net/ethernet/sfc/siena/ptp.c
+++ b/drivers/net/ethernet/sfc/siena/ptp.c
@@ -1422,7 +1422,7 @@ static void efx_ptp_worker(struct work_struct *work)
 
 static const struct ptp_clock_info efx_phc_clock_info = {
        .owner          = THIS_MODULE,
-       .name           = "sfc",
+       .name           = "sfc_siena",
        .max_adj        = MAX_PPB,
        .n_alarm        = 0,
        .n_ext_ts       = 0,
@@ -1458,7 +1458,7 @@ static int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel)
 
        skb_queue_head_init(&ptp->rxq);
        skb_queue_head_init(&ptp->txq);
-       ptp->workwq = create_singlethread_workqueue("sfc_ptp");
+       ptp->workwq = create_singlethread_workqueue("sfc_siena_ptp");
        if (!ptp->workwq) {
                rc = -ENOMEM;
                goto fail2;
@@ -1502,7 +1502,8 @@ static int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel)
                        goto fail3;
                } else if (ptp->phc_clock) {
                        INIT_WORK(&ptp->pps_work, efx_ptp_pps_worker);
-                       ptp->pps_workwq = create_singlethread_workqueue("sfc_pps");
+                       ptp->pps_workwq =
+                               create_singlethread_workqueue("sfc_siena_pps");
                        if (!ptp->pps_workwq) {
                                rc = -ENOMEM;
                                goto fail4;