Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbdFHWx2 (ORCPT ); Thu, 8 Jun 2017 18:53:28 -0400 Received: from ozlabs.org ([103.22.144.67]:40353 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751550AbdFHWxZ (ORCPT ); Thu, 8 Jun 2017 18:53:25 -0400 From: Michael Ellerman To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , Vineet Gupta , Bart Van Assche , Robin Murphy , Joerg Roedel , Johan Hovold , Alexey Kardashevskiy , Krzysztof Kozlowski , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 11/16] powerpc: vio_cmo: use dev_groups and not dev_attrs for bus_type In-Reply-To: <20170608133923.GA17811@kroah.com> References: <20170606192221.1617-1-gregkh@linuxfoundation.org> <20170606192221.1617-12-gregkh@linuxfoundation.org> <87y3t2d3o5.fsf@concordia.ellerman.id.au> <20170608133923.GA17811@kroah.com> User-Agent: Notmuch/0.21 (https://notmuchmail.org) Date: Fri, 09 Jun 2017 08:53:22 +1000 Message-ID: <87r2yuhz19.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2050 Lines: 52 Greg Kroah-Hartman writes: > On Thu, Jun 08, 2017 at 11:12:10PM +1000, Michael Ellerman wrote: >> Greg Kroah-Hartman writes: >> >> > The dev_attrs field has long been "depreciated" and is finally being >> > removed, so move the driver to use the "correct" dev_groups field >> > instead for struct bus_type. >> > >> > Cc: Benjamin Herrenschmidt >> > Cc: Paul Mackerras >> > Cc: Michael Ellerman >> > Cc: Vineet Gupta >> > Cc: Bart Van Assche >> > Cc: Robin Murphy >> > Cc: Joerg Roedel >> > Cc: Johan Hovold >> > Cc: Alexey Kardashevskiy >> > Cc: Krzysztof Kozlowski >> > Cc: >> > Signed-off-by: Greg Kroah-Hartman >> > --- >> > arch/powerpc/platforms/pseries/vio.c | 37 +++++++++++++++++++++--------------- >> > 1 file changed, 22 insertions(+), 15 deletions(-) >> >> This one needed a bit more work to get building, the incremental diff is >> below. We need a forward declaration of name, devspec and modalias, >> which is a bit weird, but that's how the code is currently structured. >> And there's dev and bus attributes with the same name, so that needed an >> added "bus". >> >> I booted v2 of patch 10 and this one and everything looks identical to >> upstream. > > Ah, many thanks, this was on my todo list to fix up today. > > But you renamed the sysfs files when you added "bus" to the function > names, are you sure you want to do that? I don't mind, but if you > happen to have userspace tools that look at those files, they just broke > :( Ugh crap, no that won't work. I didn't see it when I tested because my machine doesn't have the CMO feature enabled. I guess we have to open code some of the BUS_ATTR_RO() etc. so we can avoid the name clash. I'll try and get it fixed later today. cheers