* [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
@ 2011-03-27 2:42 Javier Martinez Canillas
2011-03-27 2:42 ` [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Javier Martinez Canillas @ 2011-03-27 2:42 UTC (permalink / raw)
To: Matt Carlson
Cc: Michael Chan, netdev, kernel-janitors, Javier Martinez Canillas
It is proper style to include linux/foo.h instead asm/foo.h if both exist
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/net/tg3.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6be4185..4410d73 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -48,9 +48,9 @@
#include <net/ip.h>
#include <asm/system.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#ifdef CONFIG_SPARC
#include <asm/idprom.h>
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM
2011-03-27 2:42 [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> Javier Martinez Canillas
@ 2011-03-27 2:42 ` Javier Martinez Canillas
2011-03-27 3:08 ` Dan Carpenter
2011-03-27 2:42 ` [PATCH 3/3] tg3: Fix inline keyword usage Javier Martinez Canillas
2011-03-28 1:38 ` [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> David Miller
2 siblings, 1 reply; 7+ messages in thread
From: Javier Martinez Canillas @ 2011-03-27 2:42 UTC (permalink / raw)
To: Matt Carlson
Cc: Michael Chan, netdev, kernel-janitors, Javier Martinez Canillas
This flag is scheduled for removal so we shouldn't used it.
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/net/tg3.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c67eb19..58c6049 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -8844,12 +8844,11 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)
fn = tg3_msi;
if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
fn = tg3_msi_1shot;
- flags = IRQF_SAMPLE_RANDOM;
} else {
fn = tg3_interrupt;
if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
fn = tg3_interrupt_tagged;
- flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
+ flags = IRQF_SHARED;
}
return request_irq(tnapi->irq_vec, fn, flags, name, tnapi);
@@ -8880,7 +8879,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
}
err = request_irq(tnapi->irq_vec, tg3_test_isr,
- IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, tnapi);
+ IRQF_SHARED, dev->name, tnapi);
if (err)
return err;
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM
2011-03-27 2:42 ` [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
@ 2011-03-27 3:08 ` Dan Carpenter
2011-03-28 1:38 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Dan Carpenter @ 2011-03-27 3:08 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: Matt Carlson, Michael Chan, netdev, kernel-janitors
On Sun, Mar 27, 2011 at 04:42:32AM +0200, Javier Martinez Canillas wrote:
> This flag is scheduled for removal so we shouldn't used it.
>
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> ---
> drivers/net/tg3.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
> index c67eb19..58c6049 100644
> --- a/drivers/net/tg3.c
> +++ b/drivers/net/tg3.c
> @@ -8844,12 +8844,11 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)
> fn = tg3_msi;
> if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
> fn = tg3_msi_1shot;
> - flags = IRQF_SAMPLE_RANDOM;
You need initialize flags to zero here. Apparently gcc doesn't catch
this. I'm using gcc 4.4.3-4ubuntu5.
regards,
dan carpenter
v
> } else {
> fn = tg3_interrupt;
> if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
> fn = tg3_interrupt_tagged;
> - flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
> + flags = IRQF_SHARED;
> }
>
> return request_irq(tnapi->irq_vec, fn, flags, name, tnapi);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM
2011-03-27 3:08 ` Dan Carpenter
@ 2011-03-28 1:38 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2011-03-28 1:38 UTC (permalink / raw)
To: error27; +Cc: martinez.javier, mcarlson, mchan, netdev, kernel-janitors
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 27 Mar 2011 06:08:30 +0300
> On Sun, Mar 27, 2011 at 04:42:32AM +0200, Javier Martinez Canillas wrote:
>> This flag is scheduled for removal so we shouldn't used it.
>>
>> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
>> ---
>> drivers/net/tg3.c | 5 ++---
>> 1 files changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
>> index c67eb19..58c6049 100644
>> --- a/drivers/net/tg3.c
>> +++ b/drivers/net/tg3.c
>> @@ -8844,12 +8844,11 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)
>> fn = tg3_msi;
>> if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI)
>> fn = tg3_msi_1shot;
>> - flags = IRQF_SAMPLE_RANDOM;
>
> You need initialize flags to zero here. Apparently gcc doesn't catch
> this. I'm using gcc 4.4.3-4ubuntu5.
Javier please fix this up and resubmit your patch.
Thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] tg3: Fix inline keyword usage
2011-03-27 2:42 [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> Javier Martinez Canillas
2011-03-27 2:42 ` [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
@ 2011-03-27 2:42 ` Javier Martinez Canillas
2011-03-28 1:39 ` David Miller
2011-03-28 1:38 ` [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> David Miller
2 siblings, 1 reply; 7+ messages in thread
From: Javier Martinez Canillas @ 2011-03-27 2:42 UTC (permalink / raw)
To: Matt Carlson
Cc: Michael Chan, netdev, kernel-janitors, Javier Martinez Canillas
The correct usage is "static inline void" not "static void inline".
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
drivers/net/tg3.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 58c6049..d7e564d 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13061,7 +13061,7 @@ done:
static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+static inline void vlan_features_add(struct net_device *dev, unsigned long flags)
{
dev->vlan_features |= flags;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
2011-03-27 2:42 [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> Javier Martinez Canillas
2011-03-27 2:42 ` [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
2011-03-27 2:42 ` [PATCH 3/3] tg3: Fix inline keyword usage Javier Martinez Canillas
@ 2011-03-28 1:38 ` David Miller
2 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2011-03-28 1:38 UTC (permalink / raw)
To: martinez.javier; +Cc: mcarlson, mchan, netdev, kernel-janitors
From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Sun, 27 Mar 2011 04:42:31 +0200
> It is proper style to include linux/foo.h instead asm/foo.h if both exist
>
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-28 1:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-27 2:42 [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> Javier Martinez Canillas
2011-03-27 2:42 ` [PATCH 2/3] tg3: Don't use IRQF_SAMPLE_RANDOM Javier Martinez Canillas
2011-03-27 3:08 ` Dan Carpenter
2011-03-28 1:38 ` David Miller
2011-03-27 2:42 ` [PATCH 3/3] tg3: Fix inline keyword usage Javier Martinez Canillas
2011-03-28 1:39 ` David Miller
2011-03-28 1:38 ` [PATCH 1/3] tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h> David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).