From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756426Ab0ECTLm (ORCPT ); Mon, 3 May 2010 15:11:42 -0400 Received: from kroah.org ([198.145.64.141]:49366 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756319Ab0ECTLj (ORCPT ); Mon, 3 May 2010 15:11:39 -0400 Date: Mon, 3 May 2010 11:59:33 -0700 From: Greg KH To: H Hartley Sweeten Cc: Linux Kernel , "devel@driverdev.osuosl.org" , Greg KH , "ss@aao.gov.au" Subject: Re: Staging: dt3155: Cleanup memory mapped i/o access Message-ID: <20100503185933.GA27346@kroah.com> References: <0D753D10438DA54287A00B0270842697636DAFCD14@AUSP01VMBX24.collaborationhost.net> <20100430215645.GA12409@kroah.com> <0D753D10438DA54287A00B0270842697636E9B9B0D@AUSP01VMBX24.collaborationhost.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0D753D10438DA54287A00B0270842697636E9B9B0D@AUSP01VMBX24.collaborationhost.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, May 02, 2010 at 01:00:41PM -0500, 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 > Cc: Scott Smedley Odd, but no, this still does not apply. I get the following errors: patching file drivers/staging/dt3155/dt3155_drv.c Hunk #1 succeeded at 75 (offset 11 lines). Hunk #2 FAILED at 115. Hunk #3 succeeded at 150 (offset 8 lines). Hunk #4 succeeded at 184 (offset 8 lines). Hunk #5 succeeded at 201 (offset 8 lines). Hunk #6 succeeded at 216 (offset 8 lines). Hunk #7 succeeded at 227 with fuzz 2 (offset 8 lines). Hunk #8 succeeded at 247 with fuzz 2 (offset 8 lines). Hunk #9 FAILED at 257. Hunk #10 succeeded at 273 with fuzz 2 (offset 8 lines). Hunk #11 succeeded at 290 (offset 8 lines). Hunk #12 succeeded at 326 with fuzz 2 (offset 8 lines). Hunk #13 FAILED at 395. Hunk #14 succeeded at 418 with fuzz 2 (offset 8 lines). Hunk #15 succeeded at 435 (offset 8 lines). Hunk #16 FAILED at 438. Hunk #17 FAILED at 456. Hunk #18 FAILED at 471. Hunk #19 succeeded at 501 (offset 8 lines). Hunk #20 succeeded at 510 (offset 8 lines). Hunk #21 succeeded at 699 (offset 8 lines). Hunk #22 succeeded at 727 (offset 8 lines). Hunk #23 succeeded at 929 with fuzz 1 (offset 8 lines). Hunk #24 succeeded at 1054 with fuzz 2 (offset 8 lines). 6 out of 24 hunks FAILED -- saving rejects to file drivers/staging/dt3155/dt3155_drv.c.rej patching file drivers/staging/dt3155/dt3155_drv.h patching file drivers/staging/dt3155/dt3155_io.c Hunk #2 FAILED at 77. Hunk #3 FAILED at 103. Hunk #4 FAILED at 119. Hunk #5 FAILED at 134. Hunk #6 FAILED at 151. 5 out of 6 hunks FAILED -- saving rejects to file drivers/staging/dt3155/dt3155_io.c.rej patching file drivers/staging/dt3155/dt3155_io.h Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file drivers/staging/dt3155/dt3155_io.h.rej Did you rebase this on the latest linux-next tree? thanks, greg k-h