1 files changed, 1 insertions, 12 deletions

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index b191dd549207..71fddbc60f18 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -1294,26 +1294,19 @@ static struct scsi_host_template qpti_template = {
 static const struct of_device_id qpti_match[];
 static int __devinit qpti_sbus_probe(struct platform_device *op)
 {
-        const struct of_device_id *match;
-        struct scsi_host_template *tpnt;
         struct device_node *dp = op->dev.of_node;
         struct Scsi_Host *host;
         struct qlogicpti *qpti;
         static int nqptis;
         const char *fcode;
 
-        match = of_match_device(qpti_match, &op->dev);
-        if (!match)
-                return -EINVAL;
-        tpnt = match->data;
-
         /* Sometimes Antares cards come up not completely
          * setup, and we get a report of a zero IRQ.
          */
         if (op->archdata.irqs[0] == 0)
                 return -ENODEV;
 
-        host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti));
+        host = scsi_host_alloc(&qpti_template, sizeof(struct qlogicpti));
         if (!host)
                 return -ENOMEM;
 
@@ -1445,19 +1438,15 @@ static int __devexit qpti_sbus_remove(struct platform_device *op)
 static const struct of_device_id qpti_match[] = {
         {
                 .name = "ptisp",
-                .data = &qpti_template,
         },
         {
                 .name = "PTI,ptisp",
-                .data = &qpti_template,
         },
         {
                 .name = "QLGC,isp",
-                .data = &qpti_template,
         },
         {
                 .name = "SUNW,isp",
-                .data = &qpti_template,
         },
         {},
 };