GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi: make the LUN a parameter of scsi_detect_dev()

Browse source 
This is a cosmetic change. target and LUN have kind of the same role in
this function. One of them was passed as a parameter and the other was
embedded in a structure. For consistency, pass both of them as parameters.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Jean-Jacques Hiblot 2017-04-07 13:42:06 +02:00 • committed by Simon Glass
parent fd138ca1bd
commit e39cecfdaf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/scsi.c
View file

@ -473,14 +473,15 @@ static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum)
* scsi_detect_dev - Detect scsi device * scsi_detect_dev - Detect scsi device
* *
* @target: target id * @target: target id
* @lun: target lun
* @dev_desc: block device description * @dev_desc: block device description
* *
* The scsi_detect_dev detects and fills a dev_desc structure when the device is * The scsi_detect_dev detects and fills a dev_desc structure when the device is
* detected. The LUN number is taken from the struct blk_desc *dev_desc. * detected.
* *
* Return: 0 on success, error value otherwise * Return: 0 on success, error value otherwise
*/ */
static int scsi_detect_dev(int target, struct blk_desc *dev_desc) static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
{ {
unsigned char perq, modi; unsigned char perq, modi;
lbaint_t capacity; lbaint_t capacity;
@ -488,7 +489,7 @@ static int scsi_detect_dev(int target, struct blk_desc *dev_desc)
ccb *pccb = (ccb *)&tempccb; ccb *pccb = (ccb *)&tempccb;
pccb->target = target; pccb->target = target;
pccb->lun = dev_desc->lun; pccb->lun = lun;
pccb->pdata = (unsigned char *)&tempbuff; pccb->pdata = (unsigned char *)&tempbuff;
pccb->datalen = 512; pccb->datalen = 512;
scsi_setup_inquiry(pccb); scsi_setup_inquiry(pccb);
@ -599,8 +600,7 @@ int scsi_scan(int mode)
bdesc = dev_get_uclass_platdata(bdev); bdesc = dev_get_uclass_platdata(bdev);
scsi_init_dev_desc_priv(bdesc); scsi_init_dev_desc_priv(bdesc);
bdesc->lun = lun; ret = scsi_detect_dev(i, lun, bdesc);
ret = scsi_detect_dev(i, bdesc);
if (ret) { if (ret) {
device_unbind(bdev); device_unbind(bdev);
continue; continue;
@ -630,8 +630,8 @@ int scsi_scan(int mode)
scsi_max_devs = 0; scsi_max_devs = 0;
for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) { for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) {
for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) { for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) {
scsi_dev_desc[scsi_max_devs].lun = lun; ret = scsi_detect_dev(i, lun,
ret = scsi_detect_dev(i, &scsi_dev_desc[scsi_max_devs]); &scsi_dev_desc[scsi_max_devs]);
if (ret) if (ret)
continue; continue;