diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-03-26 19:43:01 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:00:36 -0400 |
commit | 35173d579a08c0d145b3020039d3ba33fbf2c184 (patch) | |
tree | 3621fd21219c967dd2284c8e51208a6a91ea44b8 /drivers/scsi/isci/request.c | |
parent | 068b2c03635bf50c9b408b21435e23e7a0b89b0f (diff) |
isci: namespacecheck cleanups
* mark needlessly global routines static
* delete unused functions
* move kernel-doc blocks from header files to source
* reorder some functions to delete declarations
* more default handler cleanups phy
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r-- | drivers/scsi/isci/request.c | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index eba8e0b3c873..c6ce9d0c50c2 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c | |||
@@ -1263,47 +1263,6 @@ enum dma_data_direction isci_request_io_request_get_data_direction( | |||
1263 | * | 1263 | * |
1264 | * physical address in the specified sge. | 1264 | * physical address in the specified sge. |
1265 | */ | 1265 | */ |
1266 | dma_addr_t isci_request_sge_get_address_field( | ||
1267 | struct isci_request *request, | ||
1268 | void *sge_address) | ||
1269 | { | ||
1270 | struct sas_task *task = isci_request_access_task(request); | ||
1271 | dma_addr_t ret; | ||
1272 | struct isci_host *isci_host = isci_host_from_sas_ha( | ||
1273 | task->dev->port->ha); | ||
1274 | |||
1275 | dev_dbg(&isci_host->pdev->dev, | ||
1276 | "%s: request = %p, sge_address = %p\n", | ||
1277 | __func__, | ||
1278 | request, | ||
1279 | sge_address); | ||
1280 | |||
1281 | if (task->data_dir == PCI_DMA_NONE) | ||
1282 | return 0; | ||
1283 | |||
1284 | /* the case where num_scatter == 0 is special, in that | ||
1285 | * task->scatter is the actual buffer address, not an sgl. | ||
1286 | * so a map single is required here. | ||
1287 | */ | ||
1288 | if ((task->num_scatter == 0) && | ||
1289 | !sas_protocol_ata(task->task_proto)) { | ||
1290 | ret = dma_map_single( | ||
1291 | &isci_host->pdev->dev, | ||
1292 | task->scatter, | ||
1293 | task->total_xfer_len, | ||
1294 | task->data_dir | ||
1295 | ); | ||
1296 | request->zero_scatter_daddr = ret; | ||
1297 | } else | ||
1298 | ret = sg_dma_address(((struct scatterlist *)sge_address)); | ||
1299 | |||
1300 | dev_dbg(&isci_host->pdev->dev, | ||
1301 | "%s: bus address = %lx\n", | ||
1302 | __func__, | ||
1303 | (unsigned long)ret); | ||
1304 | |||
1305 | return ret; | ||
1306 | } | ||
1307 | 1266 | ||
1308 | 1267 | ||
1309 | /** | 1268 | /** |
@@ -1314,38 +1273,6 @@ dma_addr_t isci_request_sge_get_address_field( | |||
1314 | * | 1273 | * |
1315 | * length field value in the specified sge. | 1274 | * length field value in the specified sge. |
1316 | */ | 1275 | */ |
1317 | u32 isci_request_sge_get_length_field( | ||
1318 | struct isci_request *request, | ||
1319 | void *sge_address) | ||
1320 | { | ||
1321 | struct sas_task *task = isci_request_access_task(request); | ||
1322 | int ret; | ||
1323 | |||
1324 | dev_dbg(&request->isci_host->pdev->dev, | ||
1325 | "%s: request = %p, sge_address = %p\n", | ||
1326 | __func__, | ||
1327 | request, | ||
1328 | sge_address); | ||
1329 | |||
1330 | if (task->data_dir == PCI_DMA_NONE) | ||
1331 | return 0; | ||
1332 | |||
1333 | /* the case where num_scatter == 0 is special, in that | ||
1334 | * task->scatter is the actual buffer address, not an sgl. | ||
1335 | * so we return total_xfer_len here. | ||
1336 | */ | ||
1337 | if (task->num_scatter == 0) | ||
1338 | ret = task->total_xfer_len; | ||
1339 | else | ||
1340 | ret = sg_dma_len((struct scatterlist *)sge_address); | ||
1341 | |||
1342 | dev_dbg(&request->isci_host->pdev->dev, | ||
1343 | "%s: len = %d\n", | ||
1344 | __func__, | ||
1345 | ret); | ||
1346 | |||
1347 | return ret; | ||
1348 | } | ||
1349 | 1276 | ||
1350 | 1277 | ||
1351 | /** | 1278 | /** |