p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390/dasd: remove unneeded code 

Fix these set but not used warnings:

drivers/s390/block/dasd.c:3933:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable]
drivers/s390/block/dasd_alias.c:757:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable]

In addition to that remove the test if an unsigned is < 0:

drivers/s390/block/dasd_devmap.c:153:11: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2017-06-26 19:26:55 +02:00 committed by Martin Schwidefsky
parent cd0ae1d395
commit 4bca698ffe
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/block/dasd.c
View File

@ -3921,7 +3921,6 @@ EXPORT_SYMBOL(dasd_schedule_requeue);
int dasd_generic_pm_freeze(struct ccw_device *cdev) int dasd_generic_pm_freeze(struct ccw_device *cdev)
{ {
struct dasd_device *device = dasd_device_from_cdev(cdev); struct dasd_device *device = dasd_device_from_cdev(cdev);
int rc;
if (IS_ERR(device)) if (IS_ERR(device))
return PTR_ERR(device); return PTR_ERR(device);
@ -3930,7 +3929,7 @@ int dasd_generic_pm_freeze(struct ccw_device *cdev)
set_bit(DASD_FLAG_SUSPENDED, &device->flags); set_bit(DASD_FLAG_SUSPENDED, &device->flags);
if (device->discipline->freeze) if (device->discipline->freeze)
rc = device->discipline->freeze(device); device->discipline->freeze(device);
/* disallow new I/O */ /* disallow new I/O */
dasd_device_set_stop_bits(device, DASD_STOPPED_PM); dasd_device_set_stop_bits(device, DASD_STOPPED_PM);

3
drivers/s390/block/dasd_alias.c
View File

@ -754,7 +754,6 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu)
struct alias_pav_group *pavgroup; struct alias_pav_group *pavgroup;
struct dasd_device *device, *temp; struct dasd_device *device, *temp;
struct dasd_eckd_private *private; struct dasd_eckd_private *private;
int rc;
unsigned long flags; unsigned long flags;
LIST_HEAD(active); LIST_HEAD(active);
@ -785,7 +784,7 @@ static void flush_all_alias_devices_on_lcu(struct alias_lcu *lcu)
device = list_first_entry(&active, struct dasd_device, device = list_first_entry(&active, struct dasd_device,
alias_list); alias_list);
spin_unlock_irqrestore(&lcu->lock, flags); spin_unlock_irqrestore(&lcu->lock, flags);
rc = dasd_flush_device_queue(device); dasd_flush_device_queue(device);
spin_lock_irqsave(&lcu->lock, flags); spin_lock_irqsave(&lcu->lock, flags);
/* /*
* only move device around if it wasn't moved away while we * only move device around if it wasn't moved away while we

2
drivers/s390/block/dasd_devmap.c
View File

@ -150,7 +150,7 @@ static int __init dasd_busid(char *str, int *id0, int *id1, int *devno)
/* Old style 0xXXXX or XXXX */ /* Old style 0xXXXX or XXXX */
if (!kstrtouint(str, 16, &val)) { if (!kstrtouint(str, 16, &val)) {
*id0 = *id1 = 0; *id0 = *id1 = 0;
if (val < 0 || val > 0xffff) if (val > 0xffff)
return -EINVAL; return -EINVAL;
*devno = val; *devno = val;
return 0; return 0;