On Mon, 8 Aug 2005 16:09, Nikhil Dharashivkar wrote: > Hi Martin, > But e1000_notify_reboot () function calls this e1000_suspend() > function irrespective of CONFIG_FM is defined or not. So according to > your soution, what if CONFIG_FM is not defined. Does it? I can't find it. Martin's patch works for me. cheers > > On 8/8/05, Martin J. Bligh <[email protected]> wrote: > > e1000_suspend is only used under #ifdef CONFIG_PM. Move the declaration > > of it to be the same way, just like e1000_resume, otherwise gcc whines > > on compile. I offer as evidence: > > > > static struct pci_driver e1000_driver = { > > .name = e1000_driver_name, > > .id_table = e1000_pci_tbl, > > .probe = e1000_probe, > > .remove = __devexit_p(e1000_remove), > > /* Power Managment Hooks */ > > #ifdef CONFIG_PM > > .suspend = e1000_suspend, > > .resume = e1000_resume > > #endif > > }; > > > > > > diff -aurpN -X /home/fletch/.diff.exclude > > virgin/drivers/net/e1000/e1000_main.c > > e1000_suspend/drivers/net/e1000/e1000_main.c --- > > virgin/drivers/net/e1000/e1000_main.c 2005-08-07 09:15:36.000000000 > > -0700 +++ e1000_suspend/drivers/net/e1000/e1000_main.c 2005-08-07 > > 12:10:42.000000000 -0700 @@ -162,8 +162,8 @@ static void > > e1000_vlan_rx_add_vid(struct > > static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t > > vid); static void e1000_restore_vlan(struct e1000_adapter *adapter); > > > > -static int e1000_suspend(struct pci_dev *pdev, uint32_t state); > > #ifdef CONFIG_PM > > +static int e1000_suspend(struct pci_dev *pdev, uint32_t state); > > static int e1000_resume(struct pci_dev *pdev); > > #endif > > > > @@ -3641,6 +3641,7 @@ e1000_set_spd_dplx(struct e1000_adapter > > return 0; > > } > > > > +#ifdef CONFIG_PM > > static int > > e1000_suspend(struct pci_dev *pdev, uint32_t state) > > { > > @@ -3733,7 +3734,6 @@ e1000_suspend(struct pci_dev *pdev, uint > > return 0; > > } > > > > -#ifdef CONFIG_PM > > static int > > e1000_resume(struct pci_dev *pdev) > > { > > > > - > > To unsubscribe from this list: send the line "unsubscribe linux-kernel" > > in the body of a message to [email protected] > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > Please read the FAQ at http://www.tux.org/lkml/ -- Michael Ellerman IBM OzLabs email: michael:ellerman.id.au inmsg: mpe:jabber.org wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person
Attachment:
pgp97iOmiEmhT.pgp
Description: PGP signature
- Follow-Ups:
- Re: [PATCH] remove warning about e1000_suspend
- From: "Martin J. Bligh" <[email protected]>
- Re: [PATCH] remove warning about e1000_suspend
- References:
- Re: [PATCH] remove warning about e1000_suspend
- From: Nikhil Dharashivkar <[email protected]>
- Re: [PATCH] remove warning about e1000_suspend
- Prev by Date: Re: [PATCH] Export handle_mm_fault to modules.
- Next by Date: [patch] VIA VT8235 PCI quirk
- Previous by thread: Re: [PATCH] remove warning about e1000_suspend
- Next by thread: Re: [PATCH] remove warning about e1000_suspend
- Index(es):
