[-mm patch] remove one remaining "#define BCM_TSO 1"

[-mm patch] remove one remaining "#define BCM_TSO 1"

[Adrian Bunk]

On Thu, Jan 11, 2007 at 10:26:27PM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.20-rc3-mm1:
>...
>  git-netdev-all.patch
>...
>  git trees
>...

Since it's no longer used, this "#define BCM_TSO 1" can now be removed.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.20-rc4-mm1/drivers/net/bnx2.c.old	2007-01-21 18:25:52.000000000 +0100
+++ linux-2.6.20-rc4-mm1/drivers/net/bnx2.c	2007-01-21 18:25:58.000000000 +0100
@@ -42,7 +42,6 @@
 #include <net/ip.h>
 #include <net/tcp.h>
 #include <net/checksum.h>
-#define BCM_TSO 1
 #include <linux/workqueue.h>
 #include <linux/crc32.h>
 #include <linux/prefetch.h>

2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Adrian Bunk]

3x59x-fix-pci-resource-management.patch causes the following compile 
error with CONFIG_PCI=n:

<--  snip  -->

...
  CC      drivers/net/3c59x.o
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: In function 'vortex_init_one':
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: error: implicit declaration of function 'pci_request_regions'
/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: error: implicit declaration of function 'pci_release_regions'
make[3]: *** [drivers/net/3c59x.o] Error 1

<--  snip  -->

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Sergei Shtylyov]

Hello.

Adrian Bunk wrote:
> 3x59x-fix-pci-resource-management.patch causes the following compile 
> error with CONFIG_PCI=n:
> 
> <--  snip  -->
> 
> ...
>   CC      drivers/net/3c59x.o
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: In function 'vortex_init_one':
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: error: implicit declaration of function 'pci_request_regions'
> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: error: implicit declaration of function 'pci_release_regions'
> make[3]: *** [drivers/net/3c59x.o] Error 1

    Grr, at at the same time it's happy with pci_enable_device().
    I'd say the problem is in <linux/pci.h>,  not in the patch.

> cu
> Adrian

MBR, Sergei

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Sergei Shtylyov]

Hello, I wrote:
>> 3x59x-fix-pci-resource-management.patch causes the following compile 
>> error with CONFIG_PCI=n:

>> <--  snip  -->

>> ...
>>   CC      drivers/net/3c59x.o
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
>> In function 'vortex_init_one':
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
>> error: implicit declaration of function 'pci_request_regions'
>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
>> error: implicit declaration of function 'pci_release_regions'
>> make[3]: *** [drivers/net/3c59x.o] Error 1

>    Grr, at at the same time it's happy with pci_enable_device().
>    I'd say the problem is in <linux/pci.h>,  not in the patch.

    Has there been any patch to fix the "unbalanced" 
pci_{request|release}_regions() declarations? Am I suposed to create such?

>> cu
>> Adrian

MBR, Sergei

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Sergei Shtylyov]

Hello.

Sergei Shtylyov wrote:

>>> 3x59x-fix-pci-resource-management.patch causes the following compile 
>>> error with CONFIG_PCI=n:

>>> <--  snip  -->

>>> ...
>>>   CC      drivers/net/3c59x.o
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
>>> In function 'vortex_init_one':
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
>>> error: implicit declaration of function 'pci_request_regions'
>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
>>> error: implicit declaration of function 'pci_release_regions'
>>> make[3]: *** [drivers/net/3c59x.o] Error 1
> 
> 
>>    Grr, at at the same time it's happy with pci_enable_device().
>>    I'd say the problem is in <linux/pci.h>,  not in the patch.

>    Has there been any patch to fix the "unbalanced" 
> pci_{request|release}_regions() declarations? Am I suposed to create such?

    Alternatively, vortex_{init|remove_one() and struct pci_driver there could 
have been put under #ifdef CONFIG_PCI (good idea anyway -- should reduce 
driver size on non-PCI systems)...

>>> cu
>>> Adrian

MBR, Sergei

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Sergei Shtylyov]

Hello, I wrote:

>>>> 3x59x-fix-pci-resource-management.patch causes the following compile 
>>>> error with CONFIG_PCI=n:

>>>> <--  snip  -->

>>>> ...
>>>>   CC      drivers/net/3c59x.o
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
>>>> In function 'vortex_init_one':
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
>>>> error: implicit declaration of function 'pci_request_regions'
>>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
>>>> error: implicit declaration of function 'pci_release_regions'
>>>> make[3]: *** [drivers/net/3c59x.o] Error 1

>>>    Grr, at at the same time it's happy with pci_enable_device().
>>>    I'd say the problem is in <linux/pci.h>,  not in the patch.

>>    Has there been any patch to fix the "unbalanced" 
>> pci_{request|release}_regions() declarations? Am I suposed to create 
>> such?

>    Alternatively, vortex_{init|remove_one() and struct pci_driver there 
> could have been put under #ifdef CONFIG_PCI (good idea anyway -- should 
> reduce driver size on non-PCI systems)...

    I wonder if I may count on any feedback on this -- asking linux-pci now...
    The issue is as follows: with my patch pci_{request|release}_regions() may 
be called with CONFIG_PCI=n (probably, this never has been a issue before) but 
<linux/pci.h> don't have them declared in this case -- unlike 
pci_enable_device() which is just empty for CONFIG_PCI=n.
    Now, what kind of approach do I take:

- a "fair one", so that pci_{request|release}_regions() get "balanced"
   declarations in the header like pci_enable_device();

- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
   #ifdef out functions that are only meaningful with CONFIG_PCI=y)?

    I'm leaning to the second now...

>>>> cu
>>>> Adrian

MBR, Sergei

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Randy Dunlap]

On Mon, 26 Feb 2007 16:22:27 +0300 Sergei Shtylyov wrote:

> Hello, I wrote:
> 
> >>>> 3x59x-fix-pci-resource-management.patch causes the following compile 
> >>>> error with CONFIG_PCI=n:
> 
> >>>> <--  snip  -->
> 
> >>>> ...
> >>>>   CC      drivers/net/3c59x.o
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
> >>>> In function 'vortex_init_one':
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
> >>>> error: implicit declaration of function 'pci_request_regions'
> >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
> >>>> error: implicit declaration of function 'pci_release_regions'
> >>>> make[3]: *** [drivers/net/3c59x.o] Error 1
> 
> >>>    Grr, at at the same time it's happy with pci_enable_device().
> >>>    I'd say the problem is in <linux/pci.h>,  not in the patch.
> 
> >>    Has there been any patch to fix the "unbalanced" 
> >> pci_{request|release}_regions() declarations? Am I suposed to create 
> >> such?
> 
> >    Alternatively, vortex_{init|remove_one() and struct pci_driver there 
> > could have been put under #ifdef CONFIG_PCI (good idea anyway -- should 
> > reduce driver size on non-PCI systems)...
> 
>     I wonder if I may count on any feedback on this -- asking linux-pci now...
>     The issue is as follows: with my patch pci_{request|release}_regions() may 
> be called with CONFIG_PCI=n (probably, this never has been a issue before) but 
> <linux/pci.h> don't have them declared in this case -- unlike 
> pci_enable_device() which is just empty for CONFIG_PCI=n.
>     Now, what kind of approach do I take:
> 
> - a "fair one", so that pci_{request|release}_regions() get "balanced"
>    declarations in the header like pci_enable_device();
> 
> - a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
>    #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
> 
>     I'm leaning to the second now...

I'd prefer the fair one -- add stubs to include/linux/pci.h.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Greg KH]

On Mon, Feb 26, 2007 at 09:26:44AM -0800, Randy Dunlap wrote:
> On Mon, 26 Feb 2007 16:22:27 +0300 Sergei Shtylyov wrote:
> 
> > Hello, I wrote:
> > 
> > >>>> 3x59x-fix-pci-resource-management.patch causes the following compile 
> > >>>> error with CONFIG_PCI=n:
> > 
> > >>>> <--  snip  -->
> > 
> > >>>> ...
> > >>>>   CC      drivers/net/3c59x.o
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
> > >>>> In function 'vortex_init_one':
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
> > >>>> error: implicit declaration of function 'pci_request_regions'
> > >>>> /home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
> > >>>> error: implicit declaration of function 'pci_release_regions'
> > >>>> make[3]: *** [drivers/net/3c59x.o] Error 1
> > 
> > >>>    Grr, at at the same time it's happy with pci_enable_device().
> > >>>    I'd say the problem is in <linux/pci.h>,  not in the patch.
> > 
> > >>    Has there been any patch to fix the "unbalanced" 
> > >> pci_{request|release}_regions() declarations? Am I suposed to create 
> > >> such?
> > 
> > >    Alternatively, vortex_{init|remove_one() and struct pci_driver there 
> > > could have been put under #ifdef CONFIG_PCI (good idea anyway -- should 
> > > reduce driver size on non-PCI systems)...
> > 
> >     I wonder if I may count on any feedback on this -- asking linux-pci now...
> >     The issue is as follows: with my patch pci_{request|release}_regions() may 
> > be called with CONFIG_PCI=n (probably, this never has been a issue before) but 
> > <linux/pci.h> don't have them declared in this case -- unlike 
> > pci_enable_device() which is just empty for CONFIG_PCI=n.
> >     Now, what kind of approach do I take:
> > 
> > - a "fair one", so that pci_{request|release}_regions() get "balanced"
> >    declarations in the header like pci_enable_device();
> > 
> > - a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
> >    #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
> > 
> >     I'm leaning to the second now...
> 
> I'd prefer the fair one -- add stubs to include/linux/pci.h.

Me too, please just send me a patch adding them to pci.h so you don't
have to have #ifdefs in your .c code.

thanks,

greg k-h

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Sergei Shtylyov]

Hello.

Greg KH wrote:

>>>>>>>3x59x-fix-pci-resource-management.patch causes the following compile 
>>>>>>>error with CONFIG_PCI=n:

>>>>>>><--  snip  -->

>>>>>>>...
>>>>>>>  CC      drivers/net/3c59x.o
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
>>>>>>>In function 'vortex_init_one':
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
>>>>>>>error: implicit declaration of function 'pci_request_regions'
>>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
>>>>>>>error: implicit declaration of function 'pci_release_regions'
>>>>>>>make[3]: *** [drivers/net/3c59x.o] Error 1

>>>>>>   Grr, at at the same time it's happy with pci_enable_device().
>>>>>>   I'd say the problem is in <linux/pci.h>,  not in the patch.

>>>>>   Has there been any patch to fix the "unbalanced" 
>>>>>pci_{request|release}_regions() declarations? Am I suposed to create 
>>>>>such?

>>>>   Alternatively, vortex_{init|remove_one() and struct pci_driver there 
>>>>could have been put under #ifdef CONFIG_PCI (good idea anyway -- should 
>>>>reduce driver size on non-PCI systems)...

>>>    I wonder if I may count on any feedback on this -- asking linux-pci now...
>>>    The issue is as follows: with my patch pci_{request|release}_regions() may 
>>>be called with CONFIG_PCI=n (probably, this never has been a issue before) but 
>>><linux/pci.h> don't have them declared in this case -- unlike 
>>>pci_enable_device() which is just empty for CONFIG_PCI=n.
>>>    Now, what kind of approach do I take:

>>>- a "fair one", so that pci_{request|release}_regions() get "balanced"
>>>   declarations in the header like pci_enable_device();

>>>- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
>>>   #ifdef out functions that are only meaningful with CONFIG_PCI=y)?

>>>    I'm leaning to the second now...

>>I'd prefer the fair one -- add stubs to include/linux/pci.h.

> Me too, please just send me a patch adding them to pci.h so you don't
> have to have #ifdefs in your .c code.

    Erm, before I do that, could somebody explain what

#define HAVE_PCI_REQ_REGIONS 2

accompanying their declaration is for? I have't found any references to it in 
the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?

> thanks,

> greg k-h

WBR, Sergei

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Randy Dunlap]

On Tue, 06 Mar 2007 19:15:12 +0300 Sergei Shtylyov wrote:

> Hello.
> 
> Greg KH wrote:
> 
> >>>>>>>3x59x-fix-pci-resource-management.patch causes the following compile 
> >>>>>>>error with CONFIG_PCI=n:
> 
> >>>>>>><--  snip  -->
> 
> >>>>>>>...
> >>>>>>>  CC      drivers/net/3c59x.o
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c: 
> >>>>>>>In function 'vortex_init_one':
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:961: 
> >>>>>>>error: implicit declaration of function 'pci_request_regions'
> >>>>>>>/home/bunk/linux/kernel-2.6/linux-2.6.20-rc4-mm1/drivers/net/3c59x.c:985: 
> >>>>>>>error: implicit declaration of function 'pci_release_regions'
> >>>>>>>make[3]: *** [drivers/net/3c59x.o] Error 1
> 
> >>>>>>   Grr, at at the same time it's happy with pci_enable_device().
> >>>>>>   I'd say the problem is in <linux/pci.h>,  not in the patch.
> 
> >>>>>   Has there been any patch to fix the "unbalanced" 
> >>>>>pci_{request|release}_regions() declarations? Am I suposed to create 
> >>>>>such?
> 
> >>>>   Alternatively, vortex_{init|remove_one() and struct pci_driver there 
> >>>>could have been put under #ifdef CONFIG_PCI (good idea anyway -- should 
> >>>>reduce driver size on non-PCI systems)...
> 
> >>>    I wonder if I may count on any feedback on this -- asking linux-pci now...
> >>>    The issue is as follows: with my patch pci_{request|release}_regions() may 
> >>>be called with CONFIG_PCI=n (probably, this never has been a issue before) but 
> >>><linux/pci.h> don't have them declared in this case -- unlike 
> >>>pci_enable_device() which is just empty for CONFIG_PCI=n.
> >>>    Now, what kind of approach do I take:
> 
> >>>- a "fair one", so that pci_{request|release}_regions() get "balanced"
> >>>   declarations in the header like pci_enable_device();
> 
> >>>- a "local one" (and even saving non-PCI kernel from needless bloat), i.e.
> >>>   #ifdef out functions that are only meaningful with CONFIG_PCI=y)?
> 
> >>>    I'm leaning to the second now...
> 
> >>I'd prefer the fair one -- add stubs to include/linux/pci.h.
> 
> > Me too, please just send me a patch adding them to pci.h so you don't
> > have to have #ifdefs in your .c code.
> 
>     Erm, before I do that, could somebody explain what
> 
> #define HAVE_PCI_REQ_REGIONS 2
> 
> accompanying their declaration is for? I have't found any references to it in 
> the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?

I wouldn't since it's not used anywhere, but maybe Tejun could comment
on it...

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: 2.6.20-rc4-mm1: PCI=n: drivers/net/3c59x.c compile error

[Tejun Heo]

Hello,

Randy Dunlap wrote:
>>     Erm, before I do that, could somebody explain what
>>
>> #define HAVE_PCI_REQ_REGIONS 2
>>
>> accompanying their declaration is for? I have't found any references to it in 
>> the source. Should I duplicate it for CONFIG_PCI=n case (I guess not)?
> 
> I wouldn't since it's not used anywhere, but maybe Tejun could comment
> on it...

This is the first time I see that macro.  There is no user in the whole
source.  I think the best way is to just kill it.

Thanks.

-- 
tejun