Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762450AbYB2A0v (ORCPT ); Thu, 28 Feb 2008 19:26:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755648AbYB2A0n (ORCPT ); Thu, 28 Feb 2008 19:26:43 -0500 Received: from g4t0016.houston.hp.com ([15.201.24.19]:28047 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752534AbYB2A0m (ORCPT ); Thu, 28 Feb 2008 19:26:42 -0500 Date: Thu, 28 Feb 2008 17:26:40 -0700 From: Alex Chiang To: Gary Hade , kaneshige.kenji@jp.fujitsu.com, warthog19@eaglescrag.net Cc: Matthew Wilcox , gregkh@suse.de, kristen.c.accardi@intel.com, rick.jones2@hp.com, linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, linux-acpi@vger.kernel.org Subject: [PATCH 1/4] Remove path attribute from sgi_hotplug Message-ID: <20080229002640.GB21420@ldl.fc.hp.com> Mail-Followup-To: Alex Chiang , Gary Hade , kaneshige.kenji@jp.fujitsu.com, warthog19@eaglescrag.net, Matthew Wilcox , gregkh@suse.de, kristen.c.accardi@intel.com, rick.jones2@hp.com, linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, linux-acpi@vger.kernel.org References: <20080229002341.GA21420@ldl.fc.hp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080229002341.GA21420@ldl.fc.hp.com> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2809 Lines: 86 Rename the slot to be the contents of the 'path' sysfs attribute, and delete the attribute. The mapping from pci address to slot name is supposed to be done through the 'address' file, which will be provided automatically later in this series of patches. Signed-off-by: Alex Chiang Signed-off-by: Matthew Wilcox --- drivers/pci/hotplug/sgi_hotplug.c | 32 +------------------------------- 1 files changed, 1 insertions(+), 31 deletions(-) diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index ef07c36..693519e 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c @@ -91,21 +91,6 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = { static DEFINE_MUTEX(sn_hotplug_mutex); -static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, - char *buf) -{ - int retval = -ENOENT; - struct slot *slot = bss_hotplug_slot->private; - - if (!slot) - return retval; - - retval = sprintf (buf, "%s\n", slot->physical_path); - return retval; -} - -static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path); - static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device) { struct pcibus_info *pcibus_info; @@ -173,18 +158,10 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot, return -ENOMEM; bss_hotplug_slot->private = slot; - bss_hotplug_slot->name = kmalloc(SN_SLOT_NAME_SIZE, GFP_KERNEL); - if (!bss_hotplug_slot->name) { - kfree(bss_hotplug_slot->private); - return -ENOMEM; - } + bss_hotplug_slot->name = slot->physical_path; slot->device_num = device; slot->pci_bus = pci_bus; - sprintf(bss_hotplug_slot->name, "%04x:%02x:%02x", - pci_domain_nr(pci_bus), - ((u16)pcibus_info->pbi_buscommon.bs_persist_busnum), - device + 1); sn_generate_path(pci_bus, slot->physical_path); @@ -203,8 +180,6 @@ static struct hotplug_slot * sn_hp_destroy(void) bss_hotplug_slot = slot->hotplug_slot; list_del(&((struct slot *)bss_hotplug_slot->private)-> hp_list); - sysfs_remove_file(&bss_hotplug_slot->kobj, - &sn_slot_path_attr.attr); break; } return bss_hotplug_slot; @@ -653,11 +628,6 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) rc = pci_hp_register(bss_hotplug_slot); if (rc) goto register_err; - - rc = sysfs_create_file(&bss_hotplug_slot->kobj, - &sn_slot_path_attr.attr); - if (rc) - goto register_err; } dev_dbg(&pci_bus->self->dev, "Registered bus with hotplug\n"); return rc; -- 1.5.3.1.g1e61 -- 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/