Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / drivers / scsi / a100u2w.c

diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 66c5143..028af6b 100644 (file)
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -269,7 +269,7 @@ static u8 orc_nv_read(struct orc_host * host, u8 address, u8 *ptr)
 }
 
 /**
- *     orc_exec_sb             -       Queue an SCB with the HA
+ *     orc_exec_scb            -       Queue an SCB with the HA
  *     @host: host adapter the SCB belongs to
  *     @scb: SCB to queue for execution
  */
@@ -586,7 +586,7 @@ static int orc_reset_scsi_bus(struct orc_host * host)
  *     orc_device_reset        -       device reset handler
  *     @host: host to reset
  *     @cmd: command causing the reset
- *     @target; target device
+ *     @target: target device
  *
  *     Reset registers, reset a hanging bus and kill active and disconnected
  *     commands for target w/o soft reset
@@ -727,7 +727,7 @@ static void orc_release_scb(struct orc_host *host, struct orc_scb *scb)
        spin_unlock_irqrestore(&(host->allocation_lock), flags);
 }
 
-/**
+/*
  *     orchid_abort_scb        -       abort a command
  *
  *     Abort a queued command that has been passed to the firmware layer
@@ -902,7 +902,7 @@ static int inia100_build_scb(struct orc_host * host, struct orc_scb * scb, struc
 }
 
 /**
- *     inia100_queue           -       queue command with host
+ *     inia100_queue_lck               -       queue command with host
  *     @cmd: Command block
  *     @done: Completion function
  *
@@ -1088,8 +1088,6 @@ static int inia100_probe_one(struct pci_dev *pdev,
        unsigned long port, bios;
        int error = -ENODEV;
        u32 sz;
-       unsigned long biosaddr;
-       char *bios_phys;
 
        if (pci_enable_device(pdev))
                goto out;
@@ -1139,9 +1137,6 @@ static int inia100_probe_one(struct pci_dev *pdev,
                goto out_free_scb_array;
        }
 
-       biosaddr = host->BIOScfg;
-       biosaddr = (biosaddr << 4);
-       bios_phys = phys_to_virt(biosaddr);
        if (init_orchid(host)) {        /* Initialize orchid chip */
                printk("inia100: initial orchid fail!!\n");
                goto out_free_escb_array;