Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-microblaze.git] / drivers / scsi / 3w-xxxx.c

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index d90b9fc..a729288 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -460,12 +460,12 @@ static int tw_check_errors(TW_Device_Extension *tw_dev)
 /* This function will empty the response que */
 static void tw_empty_response_que(TW_Device_Extension *tw_dev)
 {
-       u32 status_reg_value, response_que_value;
+       u32 status_reg_value;
 
        status_reg_value = inl(TW_STATUS_REG_ADDR(tw_dev));
 
        while ((status_reg_value & TW_STATUS_RESPONSE_QUEUE_EMPTY) == 0) {
-               response_que_value = inl(TW_RESPONSE_QUEUE_REG_ADDR(tw_dev));
+               inl(TW_RESPONSE_QUEUE_REG_ADDR(tw_dev));
                status_reg_value = inl(TW_STATUS_REG_ADDR(tw_dev));
        }
 } /* End tw_empty_response_que() */
@@ -1342,10 +1342,8 @@ static int tw_scsi_biosparam(struct scsi_device *sdev, struct block_device *bdev
                             sector_t capacity, int geom[])
 {
        int heads, sectors, cylinders;
-       TW_Device_Extension *tw_dev;
 
        dprintk(KERN_NOTICE "3w-xxxx: tw_scsi_biosparam()\n");
-       tw_dev = (TW_Device_Extension *)sdev->host->hostdata;
 
        heads = 64;
        sectors = 32;