On Sat, Feb 10, 2024 at 02:01:08PM -0800, Jesse Brandeburg wrote:
> The igb driver was pre-declaring tons of functions just so that it could
> have an early declaration of the pci_driver struct.
>
> Delete a bunch of the declarations and move the struct to the bottom of the
> file, after all the functions are declared.
>
> Reviewed-by: Alan Brady <[email protected]>
> Signed-off-by: Jesse Brandeburg <[email protected]>
...
> @@ -219,19 +203,6 @@ static const struct pci_error_handlers igb_err_handler =
> {
>
> static void igb_init_dmac(struct igb_adapter *adapter, u32 pba);
>
> -static struct pci_driver igb_driver = {
> - .name = igb_driver_name,
> - .id_table = igb_pci_tbl,
> - .probe = igb_probe,
> - .remove = igb_remove,
> -#ifdef CONFIG_PM
> - .driver.pm = &igb_pm_ops,
> -#endif
> - .shutdown = igb_shutdown,
> - .sriov_configure = igb_pci_sriov_configure,
> - .err_handler = &igb_err_handler
> -};
> -
> MODULE_AUTHOR("Intel Corporation, <[email protected]>");
> MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
> MODULE_LICENSE("GPL v2");
...
> @@ -10169,4 +10142,24 @@ static void igb_nfc_filter_restore(struct
> igb_adapter *adapter)
>
> spin_unlock(&adapter->nfc_lock);
> }
> +
> +#ifdef CONFIG_PM
> +static const struct dev_pm_ops igb_pm_ops = {
> + SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume)
> + SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume,
> + igb_runtime_idle)
> +};
> +#endif
> +
> +static struct pci_driver igb_driver = {
> + .name = igb_driver_name,
> + .id_table = igb_pci_tbl,
> + .probe = igb_probe,
> + .remove = igb_remove,
> + .driver.pm = &igb_pm_ops,
Hi Jesse,
the line above causes a build failure if CONFIG_PM is not set.
> + .shutdown = igb_shutdown,
> + .sriov_configure = igb_pci_sriov_configure,
> + .err_handler = &igb_err_handler
> +};
> +
> /* igb_main.c */
...
