fm10k: wrap long line for alloc_workqueue

Trivial change here to cleanup a checkpatch.pl warning that got
introduced when changing to alloc_workqueue.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529
Note: removed unused get_ts_info routine (missed previous commit change)
(cherry picked from commit 5e3d033ec175b3d0a8da2b1fc9aee8bc8acf3cfc)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 026e88b05737088a6f0919ab61661a7fcaf8d305..30c7aa2d7a6b39e6d54877c1ac0861fc73de2897 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -1161,31 +1161,6 @@ static int fm10k_set_channels(struct net_device *dev,
        return fm10k_setup_tc(dev, netdev_get_num_tc(dev));
 }
 
-static int fm10k_get_ts_info(struct net_device *dev,
-                            struct ethtool_ts_info *info)
-{
-       struct fm10k_intfc *interface = netdev_priv(dev);
-
-       info->so_timestamping =
-               SOF_TIMESTAMPING_TX_SOFTWARE |
-               SOF_TIMESTAMPING_RX_SOFTWARE |
-               SOF_TIMESTAMPING_SOFTWARE |
-               SOF_TIMESTAMPING_TX_HARDWARE |
-               SOF_TIMESTAMPING_RX_HARDWARE |
-               SOF_TIMESTAMPING_RAW_HARDWARE;
-
-       if (interface->ptp_clock)
-               info->phc_index = ptp_clock_index(interface->ptp_clock);
-       else
-               info->phc_index = -1;
-
-       info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);
-
-       info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_ALL);
-
-       return 0;
-}
-
 static const struct ethtool_ops fm10k_ethtool_ops = {
        .get_strings            = fm10k_get_strings,
        .get_sset_count         = fm10k_get_sset_count,

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 91b4e7951049fcf9ac131c01ab26c95c95fa6a8a..e3ec33bb379ce02ef2ef669dc64c2999385123cb 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -56,7 +56,8 @@ static int __init fm10k_init_module(void)
        pr_info("%s\n", fm10k_copyright);
 
        /* create driver workqueue */
-       fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, fm10k_driver_name);
+       fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
+                                         fm10k_driver_name);
 
        fm10k_dbg_init();