Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1eb8c1 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: ub 3/3: death to ub_bd_rq_fn_1 



When Al Viro saw the ub.c, he observed that it was a proof positive of
Linus not reading patches anymore: names like fo_ob_ar_ba_2 used to
cause serious fireworks. In my defence, any good scheme can be pushed
to the realm of absurd if pushed far enough.

Signed-off-by: default avatarPete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 07d4fd25

drivers/block/ub.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -407,7 +407,7 @@ struct ub_dev { 
/*

/*

 */

 */

static void ub_cleanup(struct ub_dev *sc);

static void ub_cleanup(struct ub_dev *sc);

static int ub_bd_rq_fn_1(struct ub_lun *lun, struct request *rq);

static int ub_request_fn_1(struct ub_lun *lun, struct request *rq);

static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,

static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,

    struct ub_scsi_cmd *cmd, struct request *rq);

    struct ub_scsi_cmd *cmd, struct request *rq);

static void ub_scsi_build_block(struct ub_lun *lun,

static void ub_scsi_build_block(struct ub_lun *lun,
@@ -768,20 +768,20 @@ static struct ub_scsi_cmd *ub_cmdq_pop(struct ub_dev *sc) 
 * The request function is our main entry point

 * The request function is our main entry point

 */

 */





static void ub_bd_rq_fn(request_queue_t *q)

static void ub_request_fn(request_queue_t *q)

{

{

	struct ub_lun *lun = q->queuedata;

	struct ub_lun *lun = q->queuedata;

	struct request *rq;

	struct request *rq;





	while ((rq = elv_next_request(q)) != NULL) {

	while ((rq = elv_next_request(q)) != NULL) {

		if (ub_bd_rq_fn_1(lun, rq) != 0) {

		if (ub_request_fn_1(lun, rq) != 0) {

			blk_stop_queue(q);

			blk_stop_queue(q);

			break;

			break;

		}

		}

	}

	}

}

}





static int ub_bd_rq_fn_1(struct ub_lun *lun, struct request *rq)

static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)

{

{

	struct ub_dev *sc = lun->udev;

	struct ub_dev *sc = lun->udev;

	struct ub_scsi_cmd *cmd;

	struct ub_scsi_cmd *cmd;
@@ -2357,7 +2357,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum) 
	disk->driverfs_dev = &sc->intf->dev;	/* XXX Many to one ok? */

	disk->driverfs_dev = &sc->intf->dev;	/* XXX Many to one ok? */





	rc = -ENOMEM;

	rc = -ENOMEM;

	if ((q = blk_init_queue(ub_bd_rq_fn, &sc->lock)) == NULL)

	if ((q = blk_init_queue(ub_request_fn, &sc->lock)) == NULL)

		goto err_blkqinit;

		goto err_blkqinit;





	disk->queue = q;

	disk->queue = q;