[PATCH] staging/dt3155: fix build error caused by {write|read}l change

[PATCH] staging/dt3155: fix build error caused by {write|read}l change

[H Hartley Sweeten]

This fixes a build error caused by replacing {Write | Read}MReg with 
{write | read}l.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Cc: Scott Smedley <ss@aao.gov.au>

---

diff --git a/drivers/staging/dt3155/dt3155_io.c b/drivers/staging/dt3155/dt3155_io.c
index 6b9c685..3df2ec7 100644
--- a/drivers/staging/dt3155/dt3155_io.c
+++ b/drivers/staging/dt3155/dt3155_io.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/io.h>
 #include "dt3155.h"
 #include "dt3155_io.h"
 #include "dt3155_drv.h"

Re: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[Greg KH]

On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
> This fixes a build error caused by replacing {Write | Read}MReg with 
> {write | read}l.

Ick, can you merge this with your other patch so we don't have build
errors?  I just hit this and I had to drop all of your patches.

Can you respin all of them please?

thanks,

greg k-h

RE: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[H Hartley Sweeten]

On Thursday, April 08, 2010 12:11 PM, Greg KH wrote:
> On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
>> This fixes a build error caused by replacing {Write | Read}MReg with 
>> {write | read}l.
>
> Ick, can you merge this with your other patch so we don't have build
> errors?  I just hit this and I had to drop all of your patches.

I was expecting you to NAK all of them anyway after I saw all the code 
cleanup patches coming in on LKML.

> Can you respin all of them please?

Not a problem.  Are you planning on merging any of the dt3155 cleanup
patches?  If so I will wait until they show up.

Also, should staging patches be based on linux-next or on Linus' git tree?

Regards,
Hartley

Re: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[Greg KH]

On Thu, Apr 08, 2010 at 03:38:06PM -0500, H Hartley Sweeten wrote:
> On Thursday, April 08, 2010 12:11 PM, Greg KH wrote:
> > On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
> >> This fixes a build error caused by replacing {Write | Read}MReg with 
> >> {write | read}l.
> >
> > Ick, can you merge this with your other patch so we don't have build
> > errors?  I just hit this and I had to drop all of your patches.
> 
> I was expecting you to NAK all of them anyway after I saw all the code 
> cleanup patches coming in on LKML.
> 
> > Can you respin all of them please?
> 
> Not a problem.  Are you planning on merging any of the dt3155 cleanup
> patches?  If so I will wait until they show up.

I took some, you should have gotten the responses now.

> Also, should staging patches be based on linux-next or on Linus' git tree?

linux-next please.

thanks,

greg k-h

RE: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[H Hartley Sweeten]

On Thursday, April 08, 2010 1:46 PM, Greg KH wrote:
> On Thu, Apr 08, 2010 at 03:38:06PM -0500, H Hartley Sweeten wrote:
>> On Thursday, April 08, 2010 12:11 PM, Greg KH wrote:
>>> On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
>>>> This fixes a build error caused by replacing {Write | Read}MReg with 
>>>> {write | read}l.
>>>
>>> Ick, can you merge this with your other patch so we don't have build
>>> errors?  I just hit this and I had to drop all of your patches.
>> 
>> I was expecting you to NAK all of them anyway after I saw all the code 
>> cleanup patches coming in on LKML.
>> 
>>> Can you respin all of them please?
>> 
>> Not a problem.  Are you planning on merging any of the dt3155 cleanup
>> patches?  If so I will wait until they show up.
>
> I took some, you should have gotten the responses now.

I wasn't on the CC list for the ones I noticed on LKML.

A lot of the patches I saw seemed to be duplicate works to clean up the
files.  Plus, some of them appeared that they would conflict in various
ways.  I guess such is the life of a staging driver...

>> Also, should staging patches be based on linux-next or on Linus' git tree?
>
> linux-next please.

Not a problem.  I'll wait a bit to see what shows up before doing anything.

Regards,
Hartley

RE: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[H Hartley Sweeten]

On Thursday, April 08, 2010 1:46 PM, Greg KH wrote:
> On Thu, Apr 08, 2010 at 03:38:06PM -0500, H Hartley Sweeten wrote:
>> On Thursday, April 08, 2010 12:11 PM, Greg KH wrote:
>>> On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
>>>> This fixes a build error caused by replacing {Write | Read}MReg with 
>>>> {write | read}l.
>>>
>>> Ick, can you merge this with your other patch so we don't have build
>>> errors?  I just hit this and I had to drop all of your patches.
>> 
>> I was expecting you to NAK all of them anyway after I saw all the code 
>> cleanup patches coming in on LKML.
>> 
>>> Can you respin all of them please?
>> 
>> Not a problem.  Are you planning on merging any of the dt3155 cleanup
>> patches?  If so I will wait until they show up.
>
> I took some, you should have gotten the responses now.

Hello Greg,

Do you know off hand what (if any) of the dt3155 patches you took and when
they might show up in linux-next?  The last commits in next-20100413 are:

commit 5a0e3ad6af8660be21ca98a971cd00f331318c05
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Mar 24 17:04:11 2010 +0900

    include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from p

commit 3a8954e8f22cf31791d8c524c2839433e39f9368
Author: H Hartley Sweeten <hartleys@visionengravers.com>
Date:   Fri Feb 26 17:58:07 2010 -0700

    staging: dt3155: revert u_long to u64 usage

Regards,
Hartley

Re: [PATCH] staging/dt3155: fix build error caused by {write|read}l change

[Greg KH]

On Tue, Apr 13, 2010 at 07:50:51PM -0500, H Hartley Sweeten wrote:
> On Thursday, April 08, 2010 1:46 PM, Greg KH wrote:
> > On Thu, Apr 08, 2010 at 03:38:06PM -0500, H Hartley Sweeten wrote:
> >> On Thursday, April 08, 2010 12:11 PM, Greg KH wrote:
> >>> On Wed, Mar 03, 2010 at 11:24:06AM -0700, H Hartley Sweeten wrote:
> >>>> This fixes a build error caused by replacing {Write | Read}MReg with 
> >>>> {write | read}l.
> >>>
> >>> Ick, can you merge this with your other patch so we don't have build
> >>> errors?  I just hit this and I had to drop all of your patches.
> >> 
> >> I was expecting you to NAK all of them anyway after I saw all the code 
> >> cleanup patches coming in on LKML.
> >> 
> >>> Can you respin all of them please?
> >> 
> >> Not a problem.  Are you planning on merging any of the dt3155 cleanup
> >> patches?  If so I will wait until they show up.
> >
> > I took some, you should have gotten the responses now.
> 
> Hello Greg,
> 
> Do you know off hand what (if any) of the dt3155 patches you took and when
> they might show up in linux-next?  The last commits in next-20100413 are:
> 
> commit 5a0e3ad6af8660be21ca98a971cd00f331318c05
> Author: Tejun Heo <tj@kernel.org>
> Date:   Wed Mar 24 17:04:11 2010 +0900
> 
>     include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from p
> 
> commit 3a8954e8f22cf31791d8c524c2839433e39f9368
> Author: H Hartley Sweeten <hartleys@visionengravers.com>
> Date:   Fri Feb 26 17:58:07 2010 -0700
> 
>     staging: dt3155: revert u_long to u64 usage


Hm, I need to tell Stephen to pull the proper tree for my staging-next
stuff, I am playing around with just using git for it.  Give me some
time, I'm in a conference all this week...

thanks,

greg k-h