* Re: [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net
2005-12-18 22:52 [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net Eric Sesterhenn / snakebyte
@ 2005-12-18 23:07 ` Matthew Wilcox
2005-12-18 23:15 ` Eric Sesterhenn / snakebyte
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Matthew Wilcox @ 2005-12-18 23:07 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
On Sun, Dec 18, 2005 at 11:52:51PM +0100, Eric Sesterhenn / snakebyte wrote:
> this removes LINUX_VERSION_CODE checks in typhoon.c
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
> -#define typhoon_synchronize_irq(x) synchronize_irq()
> -#else
> #define typhoon_synchronize_irq(x) synchronize_irq(x)
> -#endif
Probably you should remove typhoon_synchronize_irq altogether.
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net
2005-12-18 22:52 [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net Eric Sesterhenn / snakebyte
2005-12-18 23:07 ` Matthew Wilcox
@ 2005-12-18 23:15 ` Eric Sesterhenn / snakebyte
2005-12-18 23:20 ` Eric Sesterhenn / snakebyte
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eric Sesterhenn / snakebyte @ 2005-12-18 23:15 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
hi,
> Probably you should remove typhoon_synchronize_irq altogether.
updated patch below.
Signed-of-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.15-rc5-git5/drivers/net/typhoon.c.orig 2005-12-18
23:42:15.000000000 +0100
+++ linux-2.6.15-rc5-git5/drivers/net/typhoon.c 2005-12-19
00:13:32.000000000 +0100
@@ -333,12 +333,6 @@ enum state_values {
#define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
#define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
-#define typhoon_synchronize_irq(x) synchronize_irq()
-#else
-#define typhoon_synchronize_irq(x) synchronize_irq(x)
-#endif
-
#if defined(NETIF_F_TSO)
#define skb_tso_size(x) (skb_shinfo(x)->tso_size)
#define TSO_NUM_DESCRIPTORS 2
@@ -2172,7 +2166,7 @@ typhoon_close(struct net_device *dev)
printk(KERN_ERR "%s: unable to stop runtime\n", dev->name);
/* Make sure there is no irq handler running on a different CPU. */
- typhoon_synchronize_irq(dev->irq);
+ synchronize_irq(dev->irq);
free_irq(dev->irq, dev);
typhoon_free_rx_rings(tp);
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net
2005-12-18 22:52 [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net Eric Sesterhenn / snakebyte
2005-12-18 23:07 ` Matthew Wilcox
2005-12-18 23:15 ` Eric Sesterhenn / snakebyte
@ 2005-12-18 23:20 ` Eric Sesterhenn / snakebyte
2005-12-18 23:22 ` Adrian Bunk
2005-12-18 23:29 ` Maximilian Attems
4 siblings, 0 replies; 6+ messages in thread
From: Eric Sesterhenn / snakebyte @ 2005-12-18 23:20 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]
sorry for the linebreaks in the patch, here is it
again.
Signed-of-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.15-rc5-git5/drivers/net/typhoon.c.orig 2005-12-18 23:42:15.000000000 +0100
+++ linux-2.6.15-rc5-git5/drivers/net/typhoon.c 2005-12-19 00:13:32.000000000 +0100
@@ -333,12 +333,6 @@ enum state_values {
#define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
#define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
-#define typhoon_synchronize_irq(x) synchronize_irq()
-#else
-#define typhoon_synchronize_irq(x) synchronize_irq(x)
-#endif
-
#if defined(NETIF_F_TSO)
#define skb_tso_size(x) (skb_shinfo(x)->tso_size)
#define TSO_NUM_DESCRIPTORS 2
@@ -2172,7 +2166,7 @@ typhoon_close(struct net_device *dev)
printk(KERN_ERR "%s: unable to stop runtime\n", dev->name);
/* Make sure there is no irq handler running on a different CPU. */
- typhoon_synchronize_irq(dev->irq);
+ synchronize_irq(dev->irq);
free_irq(dev->irq, dev);
typhoon_free_rx_rings(tp);
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net
2005-12-18 22:52 [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net Eric Sesterhenn / snakebyte
` (2 preceding siblings ...)
2005-12-18 23:20 ` Eric Sesterhenn / snakebyte
@ 2005-12-18 23:22 ` Adrian Bunk
2005-12-18 23:29 ` Maximilian Attems
4 siblings, 0 replies; 6+ messages in thread
From: Adrian Bunk @ 2005-12-18 23:22 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
On Sun, Dec 18, 2005 at 11:52:51PM +0100, Eric Sesterhenn / snakebyte wrote:
> hi,
>
> this removes LINUX_VERSION_CODE checks in typhoon.c
>
> Signed-of-by: Eric Sesterhenn <snakebyte@gmx.de>
>
> --- linux-2.6.15-rc5-git5/drivers/net/typhoon.c.orig 2005-12-18 23:42:15.000000000 +0100
> +++ linux-2.6.15-rc5-git5/drivers/net/typhoon.c 2005-12-18 23:44:37.000000000 +0100
> @@ -333,11 +333,7 @@ enum state_values {
> #define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
> #define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
> -#define typhoon_synchronize_irq(x) synchronize_irq()
> -#else
> #define typhoon_synchronize_irq(x) synchronize_irq(x)
> -#endif
>...
Two comments:
- please Cc subsystem maintainers and driver authors of the code you
touch; e.g. sometimes this kind of patches is rejected because the
driver maintainer does actually support both kernel 2.4 and 2.6 in
one file
- in this case, you should do an
s/typhoon_synchronize_irq/synchronize_irq/g throughout the whole
file
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
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net
2005-12-18 22:52 [KJ] [Patch 1/5] Cleanup LINUX_VERSION_CODE in drivers/net Eric Sesterhenn / snakebyte
` (3 preceding siblings ...)
2005-12-18 23:22 ` Adrian Bunk
@ 2005-12-18 23:29 ` Maximilian Attems
4 siblings, 0 replies; 6+ messages in thread
From: Maximilian Attems @ 2005-12-18 23:29 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
On Mon, Dec 19, 2005 at 12:22:14AM +0100, Adrian Bunk wrote:
<snipp patch>
>
> Two comments:
> - please Cc subsystem maintainers and driver authors of the code you
> touch; e.g. sometimes this kind of patches is rejected because the
> driver maintainer does actually support both kernel 2.4 and 2.6 in
> one file
well it has alway been mandatory for new janitors.
please keep the entry bar low.
the kj maintainer takes care of feeding the MAINTAINERS.
sure it often helps for quicker patch flow.
--
maks
[-- Attachment #2: Type: text/plain, Size: 168 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread