Skip to content

Commit 092ca10

Browse files
kuba-mookuba-moo
committed
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2024-03-29 (net: intel) This series contains updates to most Intel drivers. Jesse moves declaration of pci_driver struct to remove need for forward declarations in igb and converts Intel drivers to user newer power management ops. Sasha reworks power management flow on igc to avoid using rtnl_lock() during those flows. Maciej reorganizes i40e_nvm file to avoid forward declarations. * '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue: i40e: avoid forward declarations in i40e_nvm.c igc: Refactor runtime power management flow net: intel: implement modern PM ops declarations igb: simplify pci ops declaration ==================== Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 1eeb504 + ee4300b commit 092ca10

File tree

13 files changed

+602
-669
lines changed

13 files changed

+602
-669
lines changed

‎drivers/net/ethernet/intel/e100.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3037,7 +3037,7 @@ static int __e100_power_off(struct pci_dev *pdev, bool wake)
30373037
return 0;
30383038
}
30393039

3040-
static int __maybe_unused e100_suspend(struct device *dev_d)
3040+
static int e100_suspend(struct device *dev_d)
30413041
{
30423042
bool wake;
30433043

@@ -3046,7 +3046,7 @@ static int __maybe_unused e100_suspend(struct device *dev_d)
30463046
return 0;
30473047
}
30483048

3049-
static int __maybe_unused e100_resume(struct device *dev_d)
3049+
static int e100_resume(struct device *dev_d)
30503050
{
30513051
struct net_device *netdev = dev_get_drvdata(dev_d);
30523052
struct nic *nic = netdev_priv(netdev);
@@ -3163,7 +3163,7 @@ static const struct pci_error_handlers e100_err_handler = {
31633163
.resume = e100_io_resume,
31643164
};
31653165

3166-
static SIMPLE_DEV_PM_OPS(e100_pm_ops, e100_suspend, e100_resume);
3166+
static DEFINE_SIMPLE_DEV_PM_OPS(e100_pm_ops, e100_suspend, e100_resume);
31673167

31683168
static struct pci_driver e100_driver = {
31693169
.name = DRV_NAME,
@@ -3172,7 +3172,7 @@ static struct pci_driver e100_driver = {
31723172
.remove = e100_remove,
31733173

31743174
/* Power Management hooks */
3175-
.driver.pm = &e100_pm_ops,
3175+
.driver.pm = pm_sleep_ptr(&e100_pm_ops),
31763176

31773177
.shutdown = e100_shutdown,
31783178
.err_handler = &e100_err_handler,

‎drivers/net/ethernet/intel/e1000/e1000_main.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ static int e1000_vlan_rx_kill_vid(struct net_device *netdev,
149149
__be16 proto, u16 vid);
150150
static void e1000_restore_vlan(struct e1000_adapter *adapter);
151151

152-
static int __maybe_unused e1000_suspend(struct device *dev);
153-
static int __maybe_unused e1000_resume(struct device *dev);
152+
static int e1000_suspend(struct device *dev);
153+
static int e1000_resume(struct device *dev);
154154
static void e1000_shutdown(struct pci_dev *pdev);
155155

156156
#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -175,16 +175,14 @@ static const struct pci_error_handlers e1000_err_handler = {
175175
.resume = e1000_io_resume,
176176
};
177177

178-
static SIMPLE_DEV_PM_OPS(e1000_pm_ops, e1000_suspend, e1000_resume);
178+
static DEFINE_SIMPLE_DEV_PM_OPS(e1000_pm_ops, e1000_suspend, e1000_resume);
179179

180180
static struct pci_driver e1000_driver = {
181181
.name = e1000_driver_name,
182182
.id_table = e1000_pci_tbl,
183183
.probe = e1000_probe,
184184
.remove = e1000_remove,
185-
.driver = {
186-
.pm = &e1000_pm_ops,
187-
},
185+
.driver.pm = pm_sleep_ptr(&e1000_pm_ops),
188186
.shutdown = e1000_shutdown,
189187
.err_handler = &e1000_err_handler
190188
};
@@ -5135,7 +5133,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
51355133
return 0;
51365134
}
51375135

5138-
static int __maybe_unused e1000_suspend(struct device *dev)
5136+
static int e1000_suspend(struct device *dev)
51395137
{
51405138
int retval;
51415139
struct pci_dev *pdev = to_pci_dev(dev);
@@ -5147,7 +5145,7 @@ static int __maybe_unused e1000_suspend(struct device *dev)
51475145
return retval;
51485146
}
51495147

5150-
static int __maybe_unused e1000_resume(struct device *dev)
5148+
static int e1000_resume(struct device *dev)
51515149
{
51525150
struct pci_dev *pdev = to_pci_dev(dev);
51535151
struct net_device *netdev = pci_get_drvdata(pdev);

‎drivers/net/ethernet/intel/e1000e/netdev.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6950,13 +6950,13 @@ static int __e1000_resume(struct pci_dev *pdev)
69506950
return 0;
69516951
}
69526952

6953-
static __maybe_unused int e1000e_pm_prepare(struct device *dev)
6953+
static int e1000e_pm_prepare(struct device *dev)
69546954
{
69556955
return pm_runtime_suspended(dev) &&
69566956
pm_suspend_via_firmware();
69576957
}
69586958

6959-
static __maybe_unused int e1000e_pm_suspend(struct device *dev)
6959+
static int e1000e_pm_suspend(struct device *dev)
69606960
{
69616961
struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
69626962
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6979,7 +6979,7 @@ static __maybe_unused int e1000e_pm_suspend(struct device *dev)
69796979
return rc;
69806980
}
69816981

6982-
static __maybe_unused int e1000e_pm_resume(struct device *dev)
6982+
static int e1000e_pm_resume(struct device *dev)
69836983
{
69846984
struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
69856985
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -7013,7 +7013,7 @@ static __maybe_unused int e1000e_pm_runtime_idle(struct device *dev)
70137013
return -EBUSY;
70147014
}
70157015

7016-
static __maybe_unused int e1000e_pm_runtime_resume(struct device *dev)
7016+
static int e1000e_pm_runtime_resume(struct device *dev)
70177017
{
70187018
struct pci_dev *pdev = to_pci_dev(dev);
70197019
struct net_device *netdev = pci_get_drvdata(pdev);
@@ -7032,7 +7032,7 @@ static __maybe_unused int e1000e_pm_runtime_resume(struct device *dev)
70327032
return rc;
70337033
}
70347034

7035-
static __maybe_unused int e1000e_pm_runtime_suspend(struct device *dev)
7035+
static int e1000e_pm_runtime_suspend(struct device *dev)
70367036
{
70377037
struct pci_dev *pdev = to_pci_dev(dev);
70387038
struct net_device *netdev = pci_get_drvdata(pdev);
@@ -7919,18 +7919,16 @@ static const struct pci_device_id e1000_pci_tbl[] = {
79197919
};
79207920
MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
79217921

7922-
static const struct dev_pm_ops e1000_pm_ops = {
7923-
#ifdef CONFIG_PM_SLEEP
7922+
static const struct dev_pm_ops e1000e_pm_ops = {
79247923
.prepare = e1000e_pm_prepare,
79257924
.suspend = e1000e_pm_suspend,
79267925
.resume = e1000e_pm_resume,
79277926
.freeze = e1000e_pm_freeze,
79287927
.thaw = e1000e_pm_thaw,
79297928
.poweroff = e1000e_pm_suspend,
79307929
.restore = e1000e_pm_resume,
7931-
#endif
7932-
SET_RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume,
7933-
e1000e_pm_runtime_idle)
7930+
RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume,
7931+
e1000e_pm_runtime_idle)
79347932
};
79357933

79367934
/* PCI Device API Driver */
@@ -7939,9 +7937,7 @@ static struct pci_driver e1000_driver = {
79397937
.id_table = e1000_pci_tbl,
79407938
.probe = e1000_probe,
79417939
.remove = e1000_remove,
7942-
.driver = {
7943-
.pm = &e1000_pm_ops,
7944-
},
7940+
.driver.pm = pm_ptr(&e1000e_pm_ops),
79457941
.shutdown = e1000_shutdown,
79467942
.err_handler = &e1000_err_handler
79477943
};

‎drivers/net/ethernet/intel/fm10k/fm10k_pci.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2342,7 +2342,7 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface)
23422342
* suspend or hibernation. This function does not need to handle lower PCIe
23432343
* device state as the stack takes care of that for us.
23442344
**/
2345-
static int __maybe_unused fm10k_resume(struct device *dev)
2345+
static int fm10k_resume(struct device *dev)
23462346
{
23472347
struct fm10k_intfc *interface = dev_get_drvdata(dev);
23482348
struct net_device *netdev = interface->netdev;
@@ -2369,7 +2369,7 @@ static int __maybe_unused fm10k_resume(struct device *dev)
23692369
* system suspend or hibernation. This function does not need to handle lower
23702370
* PCIe device state as the stack takes care of that for us.
23712371
**/
2372-
static int __maybe_unused fm10k_suspend(struct device *dev)
2372+
static int fm10k_suspend(struct device *dev)
23732373
{
23742374
struct fm10k_intfc *interface = dev_get_drvdata(dev);
23752375
struct net_device *netdev = interface->netdev;
@@ -2502,16 +2502,14 @@ static const struct pci_error_handlers fm10k_err_handler = {
25022502
.reset_done = fm10k_io_reset_done,
25032503
};
25042504

2505-
static SIMPLE_DEV_PM_OPS(fm10k_pm_ops, fm10k_suspend, fm10k_resume);
2505+
static DEFINE_SIMPLE_DEV_PM_OPS(fm10k_pm_ops, fm10k_suspend, fm10k_resume);
25062506

25072507
static struct pci_driver fm10k_driver = {
25082508
.name = fm10k_driver_name,
25092509
.id_table = fm10k_pci_tbl,
25102510
.probe = fm10k_probe,
25112511
.remove = fm10k_remove,
2512-
.driver = {
2513-
.pm = &fm10k_pm_ops,
2514-
},
2512+
.driver.pm = pm_sleep_ptr(&fm10k_pm_ops),
25152513
.sriov_configure = fm10k_iov_configure,
25162514
.err_handler = &fm10k_err_handler
25172515
};

‎drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16505,7 +16505,7 @@ static void i40e_shutdown(struct pci_dev *pdev)
1650516505
* i40e_suspend - PM callback for moving to D3
1650616506
* @dev: generic device information structure
1650716507
**/
16508-
static int __maybe_unused i40e_suspend(struct device *dev)
16508+
static int i40e_suspend(struct device *dev)
1650916509
{
1651016510
struct i40e_pf *pf = dev_get_drvdata(dev);
1651116511
struct i40e_hw *hw = &pf->hw;
@@ -16556,7 +16556,7 @@ static int __maybe_unused i40e_suspend(struct device *dev)
1655616556
* i40e_resume - PM callback for waking up from D3
1655716557
* @dev: generic device information structure
1655816558
**/
16559-
static int __maybe_unused i40e_resume(struct device *dev)
16559+
static int i40e_resume(struct device *dev)
1656016560
{
1656116561
struct i40e_pf *pf = dev_get_drvdata(dev);
1656216562
int err;
@@ -16602,16 +16602,14 @@ static const struct pci_error_handlers i40e_err_handler = {
1660216602
.resume = i40e_pci_error_resume,
1660316603
};
1660416604

16605-
static SIMPLE_DEV_PM_OPS(i40e_pm_ops, i40e_suspend, i40e_resume);
16605+
static DEFINE_SIMPLE_DEV_PM_OPS(i40e_pm_ops, i40e_suspend, i40e_resume);
1660616606

1660716607
static struct pci_driver i40e_driver = {
1660816608
.name = i40e_driver_name,
1660916609
.id_table = i40e_pci_tbl,
1661016610
.probe = i40e_probe,
1661116611
.remove = i40e_remove,
16612-
.driver = {
16613-
.pm = &i40e_pm_ops,
16614-
},
16612+
.driver.pm = pm_sleep_ptr(&i40e_pm_ops),
1661516613
.shutdown = i40e_shutdown,
1661616614
.err_handler = &i40e_err_handler,
1661716615
.sriov_configure = i40e_pci_sriov_configure,

0 commit comments

Comments
 (0)