mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
b7b05fe7f9
This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". To set and read the device name dev_name(dev) and dev_set_name(dev) must be used. If your code uses static kobjects, which it shouldn't do, "const char *init_name" can be used to statically provide the name the registered device should have. At registration time, the init_name field is cleared, to enforce the use of dev_name(dev) to access the device name at a later time. We need to get rid of all occurrences of bus_id in the entire tree to be able to enable the new interface. Please apply this patch, and possibly convert any remaining remaining occurrences of bus_id. We want to submit a patch to -next, which will remove bus_id from "struct device", to find the remaining pieces to convert, and finally switch over to the new api, which will remove the 20 bytes array and does no longer have a size limitation. CC: Michael Buesch <mb@bu3sch.de> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
115 lines
2.4 KiB
C
115 lines
2.4 KiB
C
/*
|
|
* Sonics Silicon Backplane
|
|
* PCI Hostdevice wrapper
|
|
*
|
|
* Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>
|
|
* Copyright (c) 2005 Stefano Brivio <st3@riseup.net>
|
|
* Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
|
|
* Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
|
|
* Copyright (c) 2005-2007 Michael Buesch <mbuesch@freenet.de>
|
|
*
|
|
* Licensed under the GNU/GPL. See COPYING for details.
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/ssb/ssb.h>
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
static int ssb_pcihost_suspend(struct pci_dev *dev, pm_message_t state)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
err = ssb_bus_suspend(ssb);
|
|
if (err)
|
|
return err;
|
|
pci_save_state(dev);
|
|
pci_disable_device(dev);
|
|
pci_set_power_state(dev, pci_choose_state(dev, state));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ssb_pcihost_resume(struct pci_dev *dev)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
int err;
|
|
|
|
pci_set_power_state(dev, 0);
|
|
err = pci_enable_device(dev);
|
|
if (err)
|
|
return err;
|
|
pci_restore_state(dev);
|
|
err = ssb_bus_resume(ssb);
|
|
if (err)
|
|
return err;
|
|
|
|
return 0;
|
|
}
|
|
#else /* CONFIG_PM */
|
|
# define ssb_pcihost_suspend NULL
|
|
# define ssb_pcihost_resume NULL
|
|
#endif /* CONFIG_PM */
|
|
|
|
static int ssb_pcihost_probe(struct pci_dev *dev,
|
|
const struct pci_device_id *id)
|
|
{
|
|
struct ssb_bus *ssb;
|
|
int err = -ENOMEM;
|
|
const char *name;
|
|
|
|
ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
|
|
if (!ssb)
|
|
goto out;
|
|
err = pci_enable_device(dev);
|
|
if (err)
|
|
goto err_kfree_ssb;
|
|
name = dev_name(&dev->dev);
|
|
if (dev->driver && dev->driver->name)
|
|
name = dev->driver->name;
|
|
err = pci_request_regions(dev, name);
|
|
if (err)
|
|
goto err_pci_disable;
|
|
pci_set_master(dev);
|
|
|
|
err = ssb_bus_pcibus_register(ssb, dev);
|
|
if (err)
|
|
goto err_pci_release_regions;
|
|
|
|
pci_set_drvdata(dev, ssb);
|
|
|
|
out:
|
|
return err;
|
|
|
|
err_pci_release_regions:
|
|
pci_release_regions(dev);
|
|
err_pci_disable:
|
|
pci_disable_device(dev);
|
|
err_kfree_ssb:
|
|
kfree(ssb);
|
|
return err;
|
|
}
|
|
|
|
static void ssb_pcihost_remove(struct pci_dev *dev)
|
|
{
|
|
struct ssb_bus *ssb = pci_get_drvdata(dev);
|
|
|
|
ssb_bus_unregister(ssb);
|
|
pci_release_regions(dev);
|
|
pci_disable_device(dev);
|
|
kfree(ssb);
|
|
pci_set_drvdata(dev, NULL);
|
|
}
|
|
|
|
int ssb_pcihost_register(struct pci_driver *driver)
|
|
{
|
|
driver->probe = ssb_pcihost_probe;
|
|
driver->remove = ssb_pcihost_remove;
|
|
driver->suspend = ssb_pcihost_suspend;
|
|
driver->resume = ssb_pcihost_resume;
|
|
|
|
return pci_register_driver(driver);
|
|
}
|
|
EXPORT_SYMBOL(ssb_pcihost_register);
|