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

Commit 7a4b9706 authored by David Fries's avatar David Fries Committed by Linus Torvalds
Browse files

W1: ds2490.c ds_reset remove ds_wait_status 



ds_reset no longer calls ds_wait_status, the result wasn't used and it
would only delay the following data operations.

Signed-off-by: default avatarDavid Fries <david@fries.net>
Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b9cf1bc

drivers/w1/masters/ds2490.c

+2 −13
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st) 
		return 0;

}



static int ds_reset(struct ds_device *dev, struct ds_status *st)

static int ds_reset(struct ds_device *dev)

{

	int err;
@@ -466,14 +466,6 @@ static int ds_reset(struct ds_device *dev, struct ds_status *st) 
	if (err)

		return err;



	ds_wait_status(dev, st);

#if 0

	if (st->command_buffer_status) {

		printk(KERN_INFO "Short circuit.\n");

		return -EIO;

	}

#endif



	return 0;

}
@@ -809,12 +801,9 @@ static u8 ds9490r_read_block(void *data, u8 *buf, int len) 
static u8 ds9490r_reset(void *data)

{

	struct ds_device *dev = data;

	struct ds_status st;

	int err;



	memset(&st, 0, sizeof(st));



	err = ds_reset(dev, &st);

	err = ds_reset(dev);

	if (err)

		return 1;