From: Bjorn Helgaas <bhelgaas@google.com>
To: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: linux-pci@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH] pci: remove pcibios_add_platform_entries
Date: Wed, 30 Apr 2014 14:52:27 -0600 [thread overview]
Message-ID: <20140430205227.GA30412@google.com> (raw)
In-Reply-To: <alpine.LFD.2.11.1404171947150.1588@denkbrett>
On Thu, Apr 17, 2014 at 07:48:07PM +0200, Sebastian Ott wrote:
> Remove pcibios_add_platform_entries. Architecture specific attributes
> can be achieved by setting pdev->dev.groups .
>
> Link: https://lkml.kernel.org/r/alpine.LFD.2.11.1404141101500.1529@denkbrett
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
I cherry-picked 8e209e424f8b ("s390/pci: use pdev->dev.groups for attribute
creation") from Martin's tree and then applied this with Greg's ack to
pci/misc for v3.16. Thanks!
> ---
> drivers/pci/pci-sysfs.c | 10 ----------
> include/linux/pci.h | 1 -
> 2 files changed, 11 deletions(-)
>
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -1272,11 +1272,6 @@ static struct bin_attribute pcie_config_
> .write = pci_write_config,
> };
>
> -int __weak pcibios_add_platform_entries(struct pci_dev *dev)
> -{
> - return 0;
> -}
> -
> static ssize_t reset_store(struct device *dev,
> struct device_attribute *attr, const char *buf,
> size_t count)
> @@ -1392,11 +1387,6 @@ int __must_check pci_create_sysfs_dev_fi
> pdev->rom_attr = attr;
> }
>
> - /* add platform-specific attributes */
> - retval = pcibios_add_platform_entries(pdev);
> - if (retval)
> - goto err_rom_file;
> -
> /* add sysfs entries for various capabilities */
> retval = pci_create_capabilities_sysfs(pdev);
> if (retval)
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1572,7 +1572,6 @@ extern unsigned long pci_hotplug_io_size
> extern unsigned long pci_hotplug_mem_size;
>
> /* Architecture-specific versions may override these (weak) */
> -int pcibios_add_platform_entries(struct pci_dev *dev);
> void pcibios_disable_device(struct pci_dev *dev);
> void pcibios_set_master(struct pci_dev *dev);
> int pcibios_set_pcie_reset_state(struct pci_dev *dev,
>
prev parent reply other threads:[~2014-04-30 20:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-17 17:48 [PATCH] pci: remove pcibios_add_platform_entries Sebastian Ott
2014-04-18 2:47 ` Greg Kroah-Hartman
2014-04-30 20:52 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140430205227.GA30412@google.com \
--to=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-pci@vger.kernel.org \
--cc=sebott@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).