Message-ID: <20200717091025.GQ3278063@phenom.ffwll.local>
Date:   Fri, 17 Jul 2020 11:10:25 +0200
From:   Daniel Vetter <daniel@...ll.ch>
To:     miaoqinglang <miaoqinglang@...wei.com>
Cc:     Daniel Vetter <daniel@...ll.ch>,
        "james qian wang (Arm Technology China)" <james.qian.wang@....com>,
        Mihail Atanassov <mihail.atanassov@....com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Liviu Dudau <liviu.dudau@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        dri-devel <dri-devel@...ts.freedesktop.org>, nd <nd@....com>
Subject: Re: [PATCH -next] drm/komeda: Convert to DEFINE_SHOW_ATTRIBUTE

On Fri, Jul 17, 2020 at 04:00:36PM +0800, miaoqinglang wrote:
> 
> 
> 在 2020/7/17 15:06, Daniel Vetter 写道:
> > On Fri, Jul 17, 2020 at 8:40 AM james qian wang (Arm Technology China)
> > <james.qian.wang@....com> wrote:
> > > 
> > > On Thu, Jul 16, 2020 at 05:03:33PM +0800, Qinglang Miao wrote:
> > > > From: Liu Shixin <liushixin2@...wei.com>
> > > > 
> > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.
> > > > 
> > > > Signed-off-by: Liu Shixin <liushixin2@...wei.com>
> > > > ---
> > > >   drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 13 +------------
> > > >   1 file changed, 1 insertion(+), 12 deletions(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> > > > index 0246b2e94..4a10e6b9e 100644
> > > > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> > > > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
> > > > @@ -41,18 +41,7 @@ static int komeda_register_show(struct seq_file *sf, void *x)
> > > >        return 0;
> > > >   }
> > > > 
> > > > -static int komeda_register_open(struct inode *inode, struct file *filp)
> > > > -{
> > > > -     return single_open(filp, komeda_register_show, inode->i_private);
> > > > -}
> > > > -
> > > > -static const struct file_operations komeda_register_fops = {
> > > > -     .owner          = THIS_MODULE,
> > > > -     .open           = komeda_register_open,
> > > > -     .read_iter              = seq_read_iter,
> > > > -     .llseek         = seq_lseek,
> > > > -     .release        = single_release,
> > > > -};
> > > > +DEFINE_SHOW_ATTRIBUTE(komeda_register);
> > > > 
> > > 
> > > Hi Shixin & Qinglang
> > > 
> > > Thanks for your patch.
> > > 
> > > Reviewed-by: James Qian Wang <james.qian.wang@....com>
> > > 
> > > Since your patch is not for drm-misc-next, so seems better
> > > to leave it to you to merge it. :)
> > 
> > I do think it's for drm-misc-next, what other tree would it be for?
> > Some people put -next in their patch tag to differentiate from -fixes,
> > so maintainers know what to do with the patch. It's also not part of a
> > series, hence I think this is on you to apply it.
> >
> Hi James & Daniel,
> 
> ​Sorry I didn't make it clear in commit log, but it do based on linux-next.
> 
> ​I think the reason why James think it's not for drm-misc-next
> is conflicts exists when this patch being applied. There's conflicts because
> commit <4d4901c6d7> which switched over direct seq_read method calls to
> seq_read_iter should applied before this clean-up patch(linkage listed as
> below).
> 
> https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next/+/4d4901c6d748efab8aab6e7d2405dadaed0bea50
> 
> I can send a new patch based on mainline if needed.

Uh yes this is annoying. We're at feature cutoff so this will likely cause
bad conflicts no matter what if we merge it now, but the clean solution is
to rebase onto drm-misc-next, and then let maintainers sort out the mess
with conflicts. It's a pretty simple change in the above patch, so
shouldn't cause too many troubles.
-Daniel

> 
> ​Thanks.
> 
> Qinglang
> 
> .
> 	
> >
> > Cheers, Daniel
> > 
> > > 
> > > Thanks
> > > James
> > > 
> > > >   #ifdef CONFIG_DEBUG_FS
> > > >   static void komeda_debugfs_init(struct komeda_dev *mdev)
> > > > --
> > > > 2.17.1
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel@...ts.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > 
> > 
> > 
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Powered by blists - more mailing lists