diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index c932b3b9449..6ee1435d37f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -1109,15 +1109,6 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa | |||
1109 | return (0); | 1109 | return (0); |
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | uint64_t | ||
1113 | ahc_linux_get_memsize(void) | ||
1114 | { | ||
1115 | struct sysinfo si; | ||
1116 | |||
1117 | si_meminfo(&si); | ||
1118 | return ((uint64_t)si.totalram << PAGE_SHIFT); | ||
1119 | } | ||
1120 | |||
1121 | /* | 1112 | /* |
1122 | * Place the SCSI bus into a known state by either resetting it, | 1113 | * Place the SCSI bus into a known state by either resetting it, |
1123 | * or forcing transfer negotiations on the next command to any | 1114 | * or forcing transfer negotiations on the next command to any |
@@ -1218,11 +1209,6 @@ ahc_platform_free(struct ahc_softc *ahc) | |||
1218 | int i, j; | 1209 | int i, j; |
1219 | 1210 | ||
1220 | if (ahc->platform_data != NULL) { | 1211 | if (ahc->platform_data != NULL) { |
1221 | if (ahc->platform_data->host != NULL) { | ||
1222 | scsi_remove_host(ahc->platform_data->host); | ||
1223 | scsi_host_put(ahc->platform_data->host); | ||
1224 | } | ||
1225 | |||
1226 | /* destroy all of the device and target objects */ | 1212 | /* destroy all of the device and target objects */ |
1227 | for (i = 0; i < AHC_NUM_TARGETS; i++) { | 1213 | for (i = 0; i < AHC_NUM_TARGETS; i++) { |
1228 | starget = ahc->platform_data->starget[i]; | 1214 | starget = ahc->platform_data->starget[i]; |
@@ -1251,6 +1237,9 @@ ahc_platform_free(struct ahc_softc *ahc) | |||
1251 | 0x1000); | 1237 | 0x1000); |
1252 | } | 1238 | } |
1253 | 1239 | ||
1240 | if (ahc->platform_data->host) | ||
1241 | scsi_host_put(ahc->platform_data->host); | ||
1242 | |||
1254 | free(ahc->platform_data, M_DEVBUF); | 1243 | free(ahc->platform_data, M_DEVBUF); |
1255 | } | 1244 | } |
1256 | } | 1245 | } |