Messages in this thread | | | Date | Thu, 6 May 2010 13:25:35 -0700 | From | Greg KH <> | Subject | Re: Staging: dt3155: Cleanup memory mapped i/o access |
| |
On Thu, May 06, 2010 at 11:59:03AM -0500, H Hartley Sweeten wrote: > On Tuesday, May 04, 2010 2:23 PM, H Hartley Sweeten wrote: > > > > The macros ReadMReg and WriteMReg are really just private versions of > > the kernel's readl and writel functions. Use the kernel's functions > > instead. And since ioremap returns a (void __iomem *) not a (u8 *), > > change all the uses of dt3155_lbase to reflect this. > > > > While here, make dt3155_lbase static since it is only used in the > > dt3155_drv.c file. Also, remove the global variable dt3155_bbase > > since it is not used anywhere in the code. > > > > Where is makes sense, create a local 'mmio' variable instead of using > > dt3155_lbase[minor] to make the code more readable. > > > > This change also affects the {Read|Write}I2C functions so they are > > also modified as needed. > > > > Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> > > Cc: Greg Kroah-Hartman <gregkh@suse.de> > > Cc: Scott Smedley <ss@aao.gov.au> > > > > Greg, > > Did this patch fair any better when trying to merge it?
No, not at all :(
> If there is still an issue I will wait until Linus' tree, linux-next, > and your staging-next branch appear to be more in sync.
Yes, please wait a bit, I really don't know what is going on here, sorry.
greg k-h
| |