Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756401AbYKCQZ5 (ORCPT ); Mon, 3 Nov 2008 11:25:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754461AbYKCQZt (ORCPT ); Mon, 3 Nov 2008 11:25:49 -0500 Received: from rtsoft3.corbina.net ([85.21.88.6]:7842 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754133AbYKCQZs (ORCPT ); Mon, 3 Nov 2008 11:25:48 -0500 Date: Mon, 3 Nov 2008 19:25:47 +0300 From: Anton Vorontsov To: Dmitry Cc: linux-kernel@vger.kernel.org, cbou@mail.ru, Andrew Morton Subject: Re: [PATCH] power_supply: only register tosa_battery driver on tosa Message-ID: <20081103162547.GA25546@oksana.dev.rtsoft.ru> Reply-To: avorontsov@ru.mvista.com References: <1225271050-21171-1-git-send-email-dbaryshkov@gmail.com> <20081103145514.GA23466@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1819 Lines: 54 On Mon, Nov 03, 2008 at 07:20:06PM +0300, Dmitry wrote: > 2008/11/3 Anton Vorontsov : > > On Sun, Nov 02, 2008 at 11:36:08PM +0300, Dmitry wrote: > >> 2008/10/29 Dmitry Baryshkov : > >> > There are already several wm97xx-battery drivers. Do register the tosa one > >> > only on tosa machines. > >> > > >> > Signed-off-by: Dmitry Baryshkov > >> > --- > >> > drivers/power/tosa_battery.c | 3 +++ > >> > 1 files changed, 3 insertions(+), 0 deletions(-) > >> > >> What about this patch? > > > > Sorry for the delay. > > > >> IMO it can and should be merged during 2.6.28-rc cycle. > >> > >> diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c > >> index 2eab35a..4e52c22 100644 > >> --- a/drivers/power/tosa_battery.c > >> +++ b/drivers/power/tosa_battery.c > >> @@ -469,6 +469,9 @@ static struct platform_driver tosa_bat_driver = { > >> > >> static int __init tosa_bat_init(void) > >> { > >> + if (!machine_is_tosa()) > >> + return -EINVAL; > >> + > > > > I tend to reject this approach. You should rename the driver instead. > > > > I.e. > > -.driver.name = "wm97xx-battery", > > -.driver.name = "tosa-battery", > > > > And make sure that this won't break users of that driver (though > > I don't see any). > > The wm97xx-battery device is registered by > drivers/input/toucscreen/wm97xx-core.c Hmm.. So you can't rename the tosa driver, because then it won't work, correct? -- Anton Vorontsov email: cbouatmailru@gmail.com irc://irc.freenode.net/bd2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/