hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[S390] tape: Use ccw_dev_id to build cdev_id. 

To construct the integer containing the information from the bus_id,
it is easier to use the data from ccw_dev_id than to parse the bus_id.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Cornelia Huck 2008-05-15 16:52:37 +02:00 committed by Martin Schwidefsky
parent f16f584350
commit f455adcff1
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/s390/char/tape_core.c
View File

@ -76,32 +76,9 @@ const char *tape_op_verbose[TO_SIZE] =
[TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC", [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
}; };
static int static int devid_to_int(struct ccw_dev_id *dev_id)
busid_to_int(char *bus_id)
{ {
int dec; return dev_id->devno + (dev_id->ssid << 16);
int d;
char * s;
for(s = bus_id, d = 0; *s != '\0' && *s != '.'; s++)
d = (d * 10) + (*s - '0');
dec = d;
for(s++, d = 0; *s != '\0' && *s != '.'; s++)
d = (d * 10) + (*s - '0');
dec = (dec << 8) + d;
for(s++; *s != '\0'; s++) {
if (*s >= '0' && *s <= '9') {
d = *s - '0';
} else if (*s >= 'a' && *s <= 'f') {
d = *s - 'a' + 10;
} else {
d = *s - 'A' + 10;
}
dec = (dec << 4) + d;
}
return dec;
} }
/* /*
@ -551,6 +528,7 @@ tape_generic_probe(struct ccw_device *cdev)
{ {
struct tape_device *device; struct tape_device *device;
int ret; int ret;
struct ccw_dev_id dev_id;
device = tape_alloc_device(); device = tape_alloc_device();
if (IS_ERR(device)) if (IS_ERR(device))
@ -565,7 +543,8 @@ tape_generic_probe(struct ccw_device *cdev)
cdev->dev.driver_data = device; cdev->dev.driver_data = device;
cdev->handler = __tape_do_irq; cdev->handler = __tape_do_irq;
device->cdev = cdev; device->cdev = cdev;
device->cdev_id = busid_to_int(cdev->dev.bus_id); ccw_device_get_id(cdev, &dev_id);
device->cdev_id = devid_to_int(&dev_id);
PRINT_INFO("tape device %s found\n", cdev->dev.bus_id); PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
return ret; return ret;
} }