aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/block
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-05-23 04:24:25 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2011-05-23 04:24:28 -0400
commit7712f83aa904fef0d7d6e5ba7684c3272bddbb19 (patch)
tree39bf9b46fbe385eb7cb44118be12f6637b83659f /drivers/s390/block
parent66ceed5ad1318863c21710f316942bcefff8081c (diff)
[S390] get rid of unused variables
Remove trivially unused variables as detected with -Wunused-but-set-variable. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block')
-rw-r--r--drivers/s390/block/dasd_alias.c4
-rw-r--r--drivers/s390/block/dasd_eckd.c8
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 2b771f18d1ad..c388eda1e2b1 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -253,13 +253,11 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
253 */ 253 */
254void dasd_alias_lcu_setup_complete(struct dasd_device *device) 254void dasd_alias_lcu_setup_complete(struct dasd_device *device)
255{ 255{
256 struct dasd_eckd_private *private;
257 unsigned long flags; 256 unsigned long flags;
258 struct alias_server *server; 257 struct alias_server *server;
259 struct alias_lcu *lcu; 258 struct alias_lcu *lcu;
260 struct dasd_uid uid; 259 struct dasd_uid uid;
261 260
262 private = (struct dasd_eckd_private *) device->private;
263 device->discipline->get_uid(device, &uid); 261 device->discipline->get_uid(device, &uid);
264 lcu = NULL; 262 lcu = NULL;
265 spin_lock_irqsave(&aliastree.lock, flags); 263 spin_lock_irqsave(&aliastree.lock, flags);
@@ -279,13 +277,11 @@ void dasd_alias_lcu_setup_complete(struct dasd_device *device)
279 277
280void dasd_alias_wait_for_lcu_setup(struct dasd_device *device) 278void dasd_alias_wait_for_lcu_setup(struct dasd_device *device)
281{ 279{
282 struct dasd_eckd_private *private;
283 unsigned long flags; 280 unsigned long flags;
284 struct alias_server *server; 281 struct alias_server *server;
285 struct alias_lcu *lcu; 282 struct alias_lcu *lcu;
286 struct dasd_uid uid; 283 struct dasd_uid uid;
287 284
288 private = (struct dasd_eckd_private *) device->private;
289 device->discipline->get_uid(device, &uid); 285 device->discipline->get_uid(device, &uid);
290 lcu = NULL; 286 lcu = NULL;
291 spin_lock_irqsave(&aliastree.lock, flags); 287 spin_lock_irqsave(&aliastree.lock, flags);
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 3ebdf5f92f8f..58209434c992 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1611,10 +1611,8 @@ static void dasd_eckd_analysis_callback(struct dasd_ccw_req *init_cqr,
1611 1611
1612static int dasd_eckd_start_analysis(struct dasd_block *block) 1612static int dasd_eckd_start_analysis(struct dasd_block *block)
1613{ 1613{
1614 struct dasd_eckd_private *private;
1615 struct dasd_ccw_req *init_cqr; 1614 struct dasd_ccw_req *init_cqr;
1616 1615
1617 private = (struct dasd_eckd_private *) block->base->private;
1618 init_cqr = dasd_eckd_analysis_ccw(block->base); 1616 init_cqr = dasd_eckd_analysis_ccw(block->base);
1619 if (IS_ERR(init_cqr)) 1617 if (IS_ERR(init_cqr))
1620 return PTR_ERR(init_cqr); 1618 return PTR_ERR(init_cqr);
@@ -2264,7 +2262,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
2264 unsigned int blk_per_trk, 2262 unsigned int blk_per_trk,
2265 unsigned int blksize) 2263 unsigned int blksize)
2266{ 2264{
2267 struct dasd_eckd_private *private;
2268 unsigned long *idaws; 2265 unsigned long *idaws;
2269 struct dasd_ccw_req *cqr; 2266 struct dasd_ccw_req *cqr;
2270 struct ccw1 *ccw; 2267 struct ccw1 *ccw;
@@ -2283,7 +2280,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
2283 unsigned int recoffs; 2280 unsigned int recoffs;
2284 2281
2285 basedev = block->base; 2282 basedev = block->base;
2286 private = (struct dasd_eckd_private *) basedev->private;
2287 if (rq_data_dir(req) == READ) 2283 if (rq_data_dir(req) == READ)
2288 cmd = DASD_ECKD_CCW_READ_TRACK_DATA; 2284 cmd = DASD_ECKD_CCW_READ_TRACK_DATA;
2289 else if (rq_data_dir(req) == WRITE) 2285 else if (rq_data_dir(req) == WRITE)
@@ -2573,7 +2569,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
2573 unsigned int blk_per_trk, 2569 unsigned int blk_per_trk,
2574 unsigned int blksize) 2570 unsigned int blksize)
2575{ 2571{
2576 struct dasd_eckd_private *private;
2577 struct dasd_ccw_req *cqr; 2572 struct dasd_ccw_req *cqr;
2578 struct req_iterator iter; 2573 struct req_iterator iter;
2579 struct bio_vec *bv; 2574 struct bio_vec *bv;
@@ -2594,7 +2589,6 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
2594 unsigned int count, count_to_trk_end; 2589 unsigned int count, count_to_trk_end;
2595 2590
2596 basedev = block->base; 2591 basedev = block->base;
2597 private = (struct dasd_eckd_private *) basedev->private;
2598 if (rq_data_dir(req) == READ) { 2592 if (rq_data_dir(req) == READ) {
2599 cmd = DASD_ECKD_CCW_READ_TRACK_DATA; 2593 cmd = DASD_ECKD_CCW_READ_TRACK_DATA;
2600 itcw_op = ITCW_OP_READ; 2594 itcw_op = ITCW_OP_READ;
@@ -2801,7 +2795,6 @@ static struct dasd_ccw_req *dasd_raw_build_cp(struct dasd_device *startdev,
2801 struct dasd_block *block, 2795 struct dasd_block *block,
2802 struct request *req) 2796 struct request *req)
2803{ 2797{
2804 struct dasd_eckd_private *private;
2805 unsigned long *idaws; 2798 unsigned long *idaws;
2806 struct dasd_device *basedev; 2799 struct dasd_device *basedev;
2807 struct dasd_ccw_req *cqr; 2800 struct dasd_ccw_req *cqr;
@@ -2836,7 +2829,6 @@ static struct dasd_ccw_req *dasd_raw_build_cp(struct dasd_device *startdev,
2836 trkcount = last_trk - first_trk + 1; 2829 trkcount = last_trk - first_trk + 1;
2837 first_offs = 0; 2830 first_offs = 0;
2838 basedev = block->base; 2831 basedev = block->base;
2839 private = (struct dasd_eckd_private *) basedev->private;
2840 2832
2841 if (rq_data_dir(req) == READ) 2833 if (rq_data_dir(req) == READ)
2842 cmd = DASD_ECKD_CCW_READ_TRACK; 2834 cmd = DASD_ECKD_CCW_READ_TRACK;