Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753314AbYCUEVU (ORCPT ); Fri, 21 Mar 2008 00:21:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752335AbYCUEU7 (ORCPT ); Fri, 21 Mar 2008 00:20:59 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:45254 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbYCUEU5 (ORCPT ); Fri, 21 Mar 2008 00:20:57 -0400 Message-ID: <47E3375B.4020606@jp.fujitsu.com> Date: Fri, 21 Mar 2008 13:19:39 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) MIME-Version: 1.0 To: Alex Chiang , Greg KH CC: Gary Hade , Kristen Carlson Accardi , Matthew Wilcox , warthog19@eaglescrag.net, rick.jones2@hp.com, linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, linux-acpi@vger.kernel.org Subject: [PATCH 12/16] PCI slot: Use .default_attrs for address file (Not for mainline!) References: <20080318210539.GA30421@ldl.fc.hp.com> <47E33472.1000602@jp.fujitsu.com> In-Reply-To: <47E33472.1000602@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2365 Lines: 89 Use .default_attrs for 'address' file. This can simplify the code. Signed-off-by: Kenji Kaneshige --- drivers/pci/slot.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) Index: linux-2.6.25-rc6/drivers/pci/slot.c =================================================================== --- linux-2.6.25-rc6.orig/drivers/pci/slot.c +++ linux-2.6.25-rc6/drivers/pci/slot.c @@ -39,25 +39,6 @@ static ssize_t address_read_file(struct slot->bus->number, slot->number); } -static struct pci_slot_attribute pci_slot_attr_address = { - .attr = { .name = "address", .mode = S_IFREG | S_IRUGO }, - .show = address_read_file, -}; - -static void remove_sysfs_files(struct pci_slot *slot) -{ - sysfs_remove_file(&slot->kobj, &pci_slot_attr_address.attr); -} - -static int create_sysfs_files(struct pci_slot *slot) -{ - int result; - - result = sysfs_create_file(&slot->kobj, &pci_slot_attr_address.attr); - - return result; -} - static void pci_slot_release(struct kobject *kobj) { struct pci_slot *slot = to_pci_slot(kobj); @@ -67,13 +48,21 @@ static void pci_slot_release(struct kobj list_del(&slot->list); - remove_sysfs_files(slot); kfree(slot); } +static struct pci_slot_attribute pci_slot_attr_address = + __ATTR(address, (S_IFREG | S_IRUGO), address_read_file, NULL); + +static struct attribute *pci_slot_default_attrs[] = { + &pci_slot_attr_address.attr, + NULL, +}; + static struct kobj_type pci_slot_ktype = { .sysfs_ops = &pci_slot_sysfs_ops, .release = &pci_slot_release, + .default_attrs = pci_slot_default_attrs, }; struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, @@ -114,10 +103,6 @@ struct pci_slot *pci_create_slot(struct goto err; } - err = create_sysfs_files(slot); - if (err) - goto unregister; - INIT_LIST_HEAD(&slot->list); list_add(&slot->list, &parent->slots); @@ -127,9 +112,6 @@ struct pci_slot *pci_create_slot(struct out: up_write(&pci_bus_sem); return slot; - - unregister: - kobject_put(&slot->kobj); err: kfree(slot); slot = ERR_PTR(err); -- 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/