The following commit has been merged in the linux branch: commit e3fb20f9c8783d6e27cf84389a9606e410733eef Author: Bjorn Helgaas bjorn.helgaas@hp.com Date: Mon Oct 5 16:47:34 2009 -0600
PCI: PCIe portdrv: remove "-driver" from driver name
No need to include "-driver" in the driver name.
Signed-off-by: Bjorn Helgaas bjorn.helgaas@hp.com CC: Tom Long Nguyen tom.l.nguyen@intel.com Signed-off-by: Jesse Barnes jbarnes@virtuousgeek.org
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 6df5c98..f635e47 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -30,7 +30,6 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL");
/* global data */ -static const char device_name[] = "pcieport-driver";
static int pcie_portdrv_restore_config(struct pci_dev *dev) { @@ -262,7 +261,7 @@ static struct pci_error_handlers pcie_portdrv_err_handler = { };
static struct pci_driver pcie_portdriver = { - .name = (char *)device_name, + .name = "pcieport", .id_table = &port_pci_ids[0],
.probe = pcie_portdrv_probe,