On Wed, Jul 03, 2013 at 04:12:02PM +0300, Felipe Balbi wrote:
> Hi,
>
> On Tue, Jul 02, 2013 at 12:22:07PM -0700, Greg Kroah-Hartman wrote:
> > Drivers should not be putting debug files in /proc/ that is what debugfs
> > is for, so move the isp1362 driver's debug file to debugfs.
> >
> > Cc: Felipe Balbi <balbi@xxxxxx>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > ---
> > drivers/usb/host/isp1362-hcd.c | 45 +++++++++++-------------------------------
> > drivers/usb/host/isp1362.h | 2 +-
> > 2 files changed, 12 insertions(+), 35 deletions(-)
> >
> > diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
> > index b04e8ec..c2eb034 100644
> > --- a/drivers/usb/host/isp1362-hcd.c
> > +++ b/drivers/usb/host/isp1362-hcd.c
>
> [ snip ]
>
> > @@ -2173,41 +2160,31 @@ static int proc_isp1362_show(struct seq_file *s, void *unused)
> > return 0;
> > }
> >
> > -static int proc_isp1362_open(struct inode *inode, struct file *file)
> > +static int isp1362_open(struct inode *inode, struct file *file)
> > {
> > - return single_open(file, proc_isp1362_show, PDE_DATA(inode));
> > + return single_open(file, isp1362_show, PDE_DATA(inode));
>
> you need to fold this hunk here:
>
> diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
> index 796b81d..c15463b 100644
> --- a/drivers/usb/host/isp1362-hcd.c
> +++ b/drivers/usb/host/isp1362-hcd.c
> @@ -2156,7 +2156,7 @@ static int isp1362_show(struct seq_file *s, void *unused)
>
> static int isp1362_open(struct inode *inode, struct file *file)
> {
> - return single_open(file, isp1362_show, PDE_DATA(inode));
> + return single_open(file, isp1362_show, inode);
> }
>
> static const struct file_operations debug_ops = {
>
> otherwise it won't build. Other than that:
>
> Reviewed-by: Felipe Balbi <balbi@xxxxxx>
That's odd, I wonder why it built properly for me. Thanks for the fix,
I'll merge it in.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
