aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/umem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 251041763690..99806f9ee4ce 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1029,7 +1029,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
1029 data = ~data; 1029 data = ~data;
1030 data += 1; 1030 data += 1;
1031 1031
1032 if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) { 1032 if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, DRIVER_NAME, card)) {
1033 dev_printk(KERN_ERR, &card->dev->dev, 1033 dev_printk(KERN_ERR, &card->dev->dev,
1034 "Unable to allocate IRQ\n"); 1034 "Unable to allocate IRQ\n");
1035 ret = -ENODEV; 1035 ret = -ENODEV;
@@ -1155,7 +1155,7 @@ static int __init mm_init(void)
1155 if (retval) 1155 if (retval)
1156 return -ENOMEM; 1156 return -ENOMEM;
1157 1157
1158 err = major_nr = register_blkdev(0, "umem"); 1158 err = major_nr = register_blkdev(0, DRIVER_NAME);
1159 if (err < 0) { 1159 if (err < 0) {
1160 pci_unregister_driver(&mm_pci_driver); 1160 pci_unregister_driver(&mm_pci_driver);
1161 return -EIO; 1161 return -EIO;
@@ -1187,7 +1187,7 @@ static int __init mm_init(void)
1187 1187
1188out: 1188out:
1189 pci_unregister_driver(&mm_pci_driver); 1189 pci_unregister_driver(&mm_pci_driver);
1190 unregister_blkdev(major_nr, "umem"); 1190 unregister_blkdev(major_nr, DRIVER_NAME);
1191 while (i--) 1191 while (i--)
1192 put_disk(mm_gendisk[i]); 1192 put_disk(mm_gendisk[i]);
1193 return -ENOMEM; 1193 return -ENOMEM;
@@ -1210,7 +1210,7 @@ static void __exit mm_cleanup(void)
1210 1210
1211 pci_unregister_driver(&mm_pci_driver); 1211 pci_unregister_driver(&mm_pci_driver);
1212 1212
1213 unregister_blkdev(major_nr, "umem"); 1213 unregister_blkdev(major_nr, DRIVER_NAME);
1214} 1214}
1215 1215
1216module_init(mm_init); 1216module_init(mm_init);