Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754224AbYKGIdf (ORCPT ); Fri, 7 Nov 2008 03:33:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753019AbYKGIdT (ORCPT ); Fri, 7 Nov 2008 03:33:19 -0500 Received: from nf-out-0910.google.com ([64.233.182.189]:49780 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbYKGIdS (ORCPT ); Fri, 7 Nov 2008 03:33:18 -0500 Message-ID: Date: Fri, 7 Nov 2008 09:33:16 +0100 From: "Kay Sievers" To: "David Miller" Subject: Re: sparc: struct device - replace bus_id with dev_name(), dev_set_name() Cc: wli@holomorphy.com, greg@kroah.com, linux-kernel@vger.kernel.org In-Reply-To: <20081106.233557.193705310.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1226018639.3189.15.camel@nga> <20081106.233557.193705310.davem@davemloft.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1934 Lines: 54 On Fri, Nov 7, 2008 at 08:35, David Miller wrote: > From: Kay Sievers > Date: Fri, 07 Nov 2008 01:43:59 +0100 > >> --- a/arch/sparc/kernel/of_device.c >> +++ b/arch/sparc/kernel/of_device.c >> @@ -563,9 +563,9 @@ build_resources: >> op->dev.parent = parent; >> op->dev.bus = &of_platform_bus_type; >> if (!parent) >> - strcpy(op->dev.bus_id, "root"); >> + dev_set_name(&op->dev, "root"); >> else >> - sprintf(op->dev.bus_id, "%08x", dp->node); >> + dev_set_name(&op->dev, "%08x", dp->node); >> >> if (of_device_register(op)) { >> printk("%s: Could not register of device.\n", > > This part is OK. > >> --- a/arch/sparc64/kernel/vio.c >> +++ b/arch/sparc64/kernel/vio.c >> @@ -224,7 +224,7 @@ static struct vio_dev *vio_create_one(st >> if (!strcmp(type, "domain-services-port")) >> bus_id_name = "ds"; >> >> - if (strlen(bus_id_name) >= BUS_ID_SIZE - 4) { >> + if (strlen(bus_id_name) >= 20 - 4) { >> printk(KERN_ERR "VIO: bus_id_name [%s] is too long.\n", >> bus_id_name); >> return NULL; >> >> > > But I don't like this. > > Could you please keep the macro around until everything is converted? > Then you can remove the test entirely. > > Leaving it with just constants there is inviting confusion, no matter > how short amount of time it will be there. I can add a SPARC_BUS_ID_SIZE, to that file, or in a sparc header, but the core will not provide any such value, and have to, go to catch all remaining occurrences across the tree. Where should I add it? 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/