Commit 656e0484 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix umem driver to use pci_get/set..

parent 0d7f311c
...@@ -548,12 +548,7 @@ static void process_page(unsigned long data) ...@@ -548,12 +548,7 @@ static void process_page(unsigned long data)
return_bio = bio->bi_next; return_bio = bio->bi_next;
bio->bi_next = NULL; bio->bi_next = NULL;
/* should use bio_endio(), however already cleared bio_endio(bio, bio->bi_size, 0);
* BIO_UPTODATE. so set bio->bi_size = 0 manually to indicate
* completely done
*/
bio->bi_size = 0;
bio->bi_end_io(bio, bytes, 0);
} }
} }
...@@ -1041,7 +1036,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -1041,7 +1036,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
spin_lock_init(&card->lock); spin_lock_init(&card->lock);
dev->driver_data = card; pci_set_drvdata(dev, card);
if (pci_write_cmd != 0x0F) /* If not Memory Write & Invalidate */ if (pci_write_cmd != 0x0F) /* If not Memory Write & Invalidate */
pci_write_cmd = 0x07; /* then Memory Write command */ pci_write_cmd = 0x07; /* then Memory Write command */
...@@ -1100,7 +1095,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i ...@@ -1100,7 +1095,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
*/ */
static void mm_pci_remove(struct pci_dev *dev) static void mm_pci_remove(struct pci_dev *dev)
{ {
struct cardinfo *card = dev->driver_data; struct cardinfo *card = pci_get_drvdata(dev);
tasklet_kill(&card->tasklet); tasklet_kill(&card->tasklet);
iounmap(card->csr_remap); iounmap(card->csr_remap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment