* Re: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled
2011-02-14 20:27 ` [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled Randy Dunlap
@ 2011-02-14 20:39 ` David Miller
2011-02-14 21:32 ` Sakari Ailus
2011-02-16 19:46 ` Jesse Barnes
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2011-02-14 20:39 UTC (permalink / raw)
To: randy.dunlap
Cc: sfr, netdev, linux-pci, linux-next, linux-kernel, jbarnes,
sakari.ailus
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 14 Feb 2011 12:27:50 -0800
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> When CONFIG_PCI is not enabled, tlan.c has a build error:
> drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3'
>
> so add an inline function stub for this function to pci.h when
> PCI is not enabled, similar to other stubbed PCI functions.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled
2011-02-14 20:27 ` [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled Randy Dunlap
2011-02-14 20:39 ` David Miller
@ 2011-02-14 21:32 ` Sakari Ailus
2011-02-14 22:02 ` Sakari Ailus
2011-02-16 19:46 ` Jesse Barnes
2 siblings, 1 reply; 5+ messages in thread
From: Sakari Ailus @ 2011-02-14 21:32 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, netdev, linux-pci, linux-next, LKML, davem,
Jesse Barnes
Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> When CONFIG_PCI is not enabled, tlan.c has a build error:
> drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3'
>
> so add an inline function stub for this function to pci.h when
> PCI is not enabled, similar to other stubbed PCI functions.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Sakari Ailus <sakari.ailus@iki.fi>
Hi Randy,
I think this issue in tlan driver was caused by my recent patch which
added the suspend/resume support to tlan:
<URL:http://marc.info/?l=linux-netdev&m=129564436110754&w=3>
There apparently are tlan cards which are EISA (not PCI) which I forgot
when writing the patch. The suspend/resume has been only tested with PCI
as I have no EISA bus (let alone EISA tlan card!).
I'm going to send a fix to the tlan driver in any case.
Regards,
--
Sakari Ailus
sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled
2011-02-14 21:32 ` Sakari Ailus
@ 2011-02-14 22:02 ` Sakari Ailus
0 siblings, 0 replies; 5+ messages in thread
From: Sakari Ailus @ 2011-02-14 22:02 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, netdev, linux-pci, linux-next, LKML, davem,
Jesse Barnes
Sakari Ailus wrote:
> Randy Dunlap wrote:
>> From: Randy Dunlap<randy.dunlap@oracle.com>
>>
>> When CONFIG_PCI is not enabled, tlan.c has a build error:
>> drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3'
>>
>> so add an inline function stub for this function to pci.h when
>> PCI is not enabled, similar to other stubbed PCI functions.
>>
>> Signed-off-by: Randy Dunlap<randy.dunlap@oracle.com>
>> Cc: Sakari Ailus<sakari.ailus@iki.fi>
>
> Hi Randy,
>
> I think this issue in tlan driver was caused by my recent patch which
> added the suspend/resume support to tlan:
>
> <URL:http://marc.info/?l=linux-netdev&m=129564436110754&w=3>
>
> There apparently are tlan cards which are EISA (not PCI) which I forgot
> when writing the patch. The suspend/resume has been only tested with PCI
> as I have no EISA bus (let alone EISA tlan card!).
Right; so I suppose there's no PM support in EISA anyway. Other pci
functions appear to be no-ops when CONFIG_PCI isn't defined so this
patch seems right to me --- and no changes are needed in the tlan driver.
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
--
Sakari Ailus
sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled
2011-02-14 20:27 ` [PATCH -next] PCI: fix tlan build when CONFIG_PCI is not enabled Randy Dunlap
2011-02-14 20:39 ` David Miller
2011-02-14 21:32 ` Sakari Ailus
@ 2011-02-16 19:46 ` Jesse Barnes
2 siblings, 0 replies; 5+ messages in thread
From: Jesse Barnes @ 2011-02-16 19:46 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, netdev, linux-pci, linux-next, LKML, davem,
Sakari Ailus
On Mon, 14 Feb 2011 12:27:50 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> When CONFIG_PCI is not enabled, tlan.c has a build error:
> drivers/net/tlan.c:503: error: implicit declaration of function 'pci_wake_from_d3'
>
> so add an inline function stub for this function to pci.h when
> PCI is not enabled, similar to other stubbed PCI functions.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Sakari Ailus <sakari.ailus@iki.fi>
> ---
> include/linux/pci.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> --- linux-next-20110214.orig/include/linux/pci.h
> +++ linux-next-20110214/include/linux/pci.h
> @@ -1191,6 +1191,11 @@ static inline int pci_set_power_state(st
> return 0;
> }
>
> +static inline int pci_wake_from_d3(struct pci_dev *dev, bool enable)
> +{
> + return 0;
> +}
> +
> static inline pci_power_t pci_choose_state(struct pci_dev *dev,
> pm_message_t state)
> {
>
Applied to linux-next, thanks guys.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread