diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-06 11:25:50 -0400 |
commit | 2dc11581376829303b98eadb2de253bee065a56a (patch) | |
tree | dbce62559c822cd720d1819a50c488bfecdfa945 /drivers/scsi/qlogicpti.c | |
parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) |
of/device: Replace struct of_device with struct platform_device
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and update comment blocks.
This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.
@@
@@
-struct of_device
+struct platform_device
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/qlogicpti.c')
-rw-r--r-- | drivers/scsi/qlogicpti.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 53d7ed0dc169..f8c561cf751e 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c | |||
@@ -704,7 +704,7 @@ static void __devexit qpti_chain_del(struct qlogicpti *qpti) | |||
704 | 704 | ||
705 | static int __devinit qpti_map_regs(struct qlogicpti *qpti) | 705 | static int __devinit qpti_map_regs(struct qlogicpti *qpti) |
706 | { | 706 | { |
707 | struct of_device *op = qpti->op; | 707 | struct platform_device *op = qpti->op; |
708 | 708 | ||
709 | qpti->qregs = of_ioremap(&op->resource[0], 0, | 709 | qpti->qregs = of_ioremap(&op->resource[0], 0, |
710 | resource_size(&op->resource[0]), | 710 | resource_size(&op->resource[0]), |
@@ -727,7 +727,7 @@ static int __devinit qpti_map_regs(struct qlogicpti *qpti) | |||
727 | 727 | ||
728 | static int __devinit qpti_register_irq(struct qlogicpti *qpti) | 728 | static int __devinit qpti_register_irq(struct qlogicpti *qpti) |
729 | { | 729 | { |
730 | struct of_device *op = qpti->op; | 730 | struct platform_device *op = qpti->op; |
731 | 731 | ||
732 | qpti->qhost->irq = qpti->irq = op->archdata.irqs[0]; | 732 | qpti->qhost->irq = qpti->irq = op->archdata.irqs[0]; |
733 | 733 | ||
@@ -752,7 +752,7 @@ fail: | |||
752 | 752 | ||
753 | static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti) | 753 | static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti) |
754 | { | 754 | { |
755 | struct of_device *op = qpti->op; | 755 | struct platform_device *op = qpti->op; |
756 | struct device_node *dp; | 756 | struct device_node *dp; |
757 | 757 | ||
758 | dp = op->dev.of_node; | 758 | dp = op->dev.of_node; |
@@ -773,7 +773,7 @@ static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti) | |||
773 | 773 | ||
774 | static void qpti_get_bursts(struct qlogicpti *qpti) | 774 | static void qpti_get_bursts(struct qlogicpti *qpti) |
775 | { | 775 | { |
776 | struct of_device *op = qpti->op; | 776 | struct platform_device *op = qpti->op; |
777 | u8 bursts, bmask; | 777 | u8 bursts, bmask; |
778 | 778 | ||
779 | bursts = of_getintprop_default(op->dev.of_node, "burst-sizes", 0xff); | 779 | bursts = of_getintprop_default(op->dev.of_node, "burst-sizes", 0xff); |
@@ -806,7 +806,7 @@ static void qpti_get_clock(struct qlogicpti *qpti) | |||
806 | */ | 806 | */ |
807 | static int __devinit qpti_map_queues(struct qlogicpti *qpti) | 807 | static int __devinit qpti_map_queues(struct qlogicpti *qpti) |
808 | { | 808 | { |
809 | struct of_device *op = qpti->op; | 809 | struct platform_device *op = qpti->op; |
810 | 810 | ||
811 | #define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN) | 811 | #define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN) |
812 | qpti->res_cpu = dma_alloc_coherent(&op->dev, | 812 | qpti->res_cpu = dma_alloc_coherent(&op->dev, |
@@ -1290,7 +1290,7 @@ static struct scsi_host_template qpti_template = { | |||
1290 | .use_clustering = ENABLE_CLUSTERING, | 1290 | .use_clustering = ENABLE_CLUSTERING, |
1291 | }; | 1291 | }; |
1292 | 1292 | ||
1293 | static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match) | 1293 | static int __devinit qpti_sbus_probe(struct platform_device *op, const struct of_device_id *match) |
1294 | { | 1294 | { |
1295 | struct scsi_host_template *tpnt = match->data; | 1295 | struct scsi_host_template *tpnt = match->data; |
1296 | struct device_node *dp = op->dev.of_node; | 1296 | struct device_node *dp = op->dev.of_node; |
@@ -1401,7 +1401,7 @@ fail_unlink: | |||
1401 | return -ENODEV; | 1401 | return -ENODEV; |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | static int __devexit qpti_sbus_remove(struct of_device *op) | 1404 | static int __devexit qpti_sbus_remove(struct platform_device *op) |
1405 | { | 1405 | { |
1406 | struct qlogicpti *qpti = dev_get_drvdata(&op->dev); | 1406 | struct qlogicpti *qpti = dev_get_drvdata(&op->dev); |
1407 | 1407 | ||