Re: pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()

[Dominik Brodowski <linux@dominikbrodowski.net>]

Kay,

On Sun, Nov 02, 2008 at 02:55:46PM +0100, Kay Sievers wrote:
> On Sun, Nov 2, 2008 at 13:13, Dominik Brodowski
> <linux@dominikbrodowski.net> wrote:
> > On Sat, Nov 01, 2008 at 11:46:06AM +0100, Kay Sievers wrote:
> >> From: Kay Sievers <kay.sievers@vrfy.org>
> >> Subject: pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
> >>
> >> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> >> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> >> Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
> >
> > 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,

it's in -pcmcia now.

> >> 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().

Ah, okay. Thanks.

	Dominik