kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libata: use dev_driver_string() instead of "libata" in libata-sff.c

Browse source 
libata-sff code used DRV_NAME which is hardcoded to "libata" when
requesting resources.  Use dev_driver_string() such that low level
driver names are used in resource listing.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2008-01-04 18:42:21 +09:00 committed by Jeff Garzik
parent 723159c583
commit 35a10a80da
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/ata/libata-sff.c
View file

@ -551,7 +551,7 @@ int ata_pci_init_bmdma(struct ata_host *host)
return rc; return rc;
/* request and iomap DMA region */ /* request and iomap DMA region */
rc = pcim_iomap_regions(pdev, 1 << 4, DRV_NAME); rc = pcim_iomap_regions(pdev, 1 << 4, dev_driver_string(gdev));
if (rc) { if (rc) {
dev_printk(KERN_ERR, gdev, "failed to request/iomap BAR4\n"); dev_printk(KERN_ERR, gdev, "failed to request/iomap BAR4\n");
return -ENOMEM; return -ENOMEM;
@ -621,7 +621,8 @@ int ata_pci_init_sff_host(struct ata_host *host)
continue; continue;
} }
rc = pcim_iomap_regions(pdev, 0x3 << base, DRV_NAME); rc = pcim_iomap_regions(pdev, 0x3 << base,
dev_driver_string(gdev));
if (rc) { if (rc) {
dev_printk(KERN_WARNING, gdev, dev_printk(KERN_WARNING, gdev,
"failed to request/iomap BARs for port %d " "failed to request/iomap BARs for port %d "
@ -741,6 +742,7 @@ int ata_pci_init_one(struct pci_dev *pdev,
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct ata_port_info *pi = NULL; const struct ata_port_info *pi = NULL;
struct ata_host *host = NULL; struct ata_host *host = NULL;
const char *drv_name = dev_driver_string(&pdev->dev);
u8 mask; u8 mask;
int legacy_mode = 0; int legacy_mode = 0;
int i, rc; int i, rc;
@ -813,7 +815,7 @@ int ata_pci_init_one(struct pci_dev *pdev,
shouldn't happen on a sane system but robustness is cheap shouldn't happen on a sane system but robustness is cheap
in this case */ in this case */
rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler, rc = devm_request_irq(dev, pdev->irq, pi->port_ops->irq_handler,
IRQF_SHARED, DRV_NAME, host); IRQF_SHARED, drv_name, host);
if (rc) if (rc)
goto err_out; goto err_out;
@ -823,7 +825,7 @@ int ata_pci_init_one(struct pci_dev *pdev,
if (!ata_port_is_dummy(host->ports[0])) { if (!ata_port_is_dummy(host->ports[0])) {
rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev), rc = devm_request_irq(dev, ATA_PRIMARY_IRQ(pdev),
pi->port_ops->irq_handler, pi->port_ops->irq_handler,
IRQF_SHARED, DRV_NAME, host); IRQF_SHARED, drv_name, host);
if (rc) if (rc)
goto err_out; goto err_out;
@ -834,7 +836,7 @@ int ata_pci_init_one(struct pci_dev *pdev,
if (!ata_port_is_dummy(host->ports[1])) { if (!ata_port_is_dummy(host->ports[1])) {
rc = devm_request_irq(dev, ATA_SECONDARY_IRQ(pdev), rc = devm_request_irq(dev, ATA_SECONDARY_IRQ(pdev),
pi->port_ops->irq_handler, pi->port_ops->irq_handler,
IRQF_SHARED, DRV_NAME, host); IRQF_SHARED, drv_name, host);
if (rc) if (rc)
goto err_out; goto err_out;