Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / scsi / aic7xxx / aic7xxx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 5a477cdc780dcf1c3a8ecc0865ce9199a517daf8..c0c62583b5420610b23ab2732eb8a05d0468ef8c 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -803,7 +803,8 @@ struct scsi_host_template aic7xxx_driver_template = {
        .module                 = THIS_MODULE,
        .name                   = "aic7xxx",
        .proc_name              = "aic7xxx",
-       .proc_info              = ahc_linux_proc_info,
+       .show_info              = ahc_linux_show_info,
+       .write_info             = ahc_proc_write_seeprom,
        .info                   = ahc_linux_info,
        .queuecommand           = ahc_linux_queue,
        .eh_abort_handler       = ahc_linux_abort,
@@ -1631,10 +1632,8 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
        switch (code) {
        case AC_TRANSFER_NEG:
        {
-               char    buf[80];
                struct  scsi_target *starget;
                struct  ahc_linux_target *targ;
-               struct  info_str info;
                struct  ahc_initiator_tinfo *tinfo;
                struct  ahc_tmode_tstate *tstate;
                int     target_offset;
@@ -1642,10 +1641,6 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
 
                BUG_ON(target == CAM_TARGET_WILDCARD);
 
-               info.buffer = buf;
-               info.length = sizeof(buf);
-               info.offset = 0;
-               info.pos = 0;
                tinfo = ahc_fetch_transinfo(ahc, channel,
                                                channel == 'A' ? ahc->our_id
                                                               : ahc->our_id_b,