Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753818AbYKBNz6 (ORCPT ); Sun, 2 Nov 2008 08:55:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753341AbYKBNzs (ORCPT ); Sun, 2 Nov 2008 08:55:48 -0500 Received: from ey-out-2122.google.com ([74.125.78.25]:27206 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752637AbYKBNzr (ORCPT ); Sun, 2 Nov 2008 08:55:47 -0500 Message-ID: Date: Sun, 2 Nov 2008 14:55:46 +0100 From: "Kay Sievers" To: "Dominik Brodowski" , "Kay Sievers" , linux-kernel , "Greg KH" Subject: Re: pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() In-Reply-To: <20081102121320.GA15349@comet.dominikbrodowski.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1225536366.13224.2.camel@nga.site> <20081102121320.GA15349@comet.dominikbrodowski.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1790 Lines: 41 On Sun, Nov 2, 2008 at 13:13, Dominik Brodowski wrote: > On Sat, Nov 01, 2008 at 11:46:06AM +0100, Kay Sievers wrote: >> From: Kay Sievers >> Subject: pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() >> >> Cc: Dominik Brodowski >> Acked-by: Greg Kroah-Hartman >> Signed-Off-By: Kay Sievers > > is this to go in via -pcmcia or via -driver-core? Would be great if this goes through -pcmcia, and show up in -next soon, so we can continue to address the rest of the tree in -next, after the patches are merged from the subsystem trees. >> diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c >> index c68c5d3..5d0e60e 100644 >> --- a/drivers/pcmcia/cs.c >> +++ b/drivers/pcmcia/cs.c >> @@ -226,7 +226,7 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) >> /* set proper values in socket->dev */ >> dev_set_drvdata(&socket->dev, socket); >> socket->dev.class = &pcmcia_socket_class; >> - snprintf(socket->dev.bus_id, BUS_ID_SIZE, "pcmcia_socket%u", socket->sock); >> + dev_set_name(&socket->dev, "pcmcia_socket%u", socket->sock); > > In other places, you check for !dev_name() afterwards -- why not here? The name is used in the line just below setting it, which is why we need to check that it is not NULL. The other case, like in almost all other cases, the unlikely event of failing to set the name is handled by a failing call to device_register(). Thanks, Kay -- 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/