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

Commit 122f06f8 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: checkpatch.pl fixes for ide-iops.c 



Fix following checkpatch.pl warnings/errors:
- WARNING: space prohibited between function name and open parenthesis '('
- WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
- WARNING: line over 80 characters
- ERROR: trailing whitespace
- ERROR: space required before the open parenthesis '('

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ee1b1cc9

drivers/ide/ide-iops.c

+23 −25
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ void ide_fixstring (u8 *s, const int bytecount, const int byteswap) 
	while (p != end)

		*p++ = '\0';

}



EXPORT_SYMBOL(ide_fixstring);



/*
@@ -121,7 +120,8 @@ EXPORT_SYMBOL(ide_fixstring); 
 * setting a timer to wake up at half second intervals thereafter,

 * until timeout is achieved, before timing out.

 */

static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long timeout, u8 *rstat)

static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,

			   unsigned long timeout, u8 *rstat)

{

	ide_hwif_t *hwif = drive->hwif;

	const struct ide_tp_ops *tp_ops = hwif->tp_ops;
@@ -179,7 +179,8 @@ static int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, unsigned long ti 
 * The caller should return the updated value of "startstop" in this case,

 * "startstop" is unchanged when the function returns 0.

 */

int ide_wait_stat(ide_startstop_t *startstop, ide_drive_t *drive, u8 good, u8 bad, unsigned long timeout)

int ide_wait_stat(ide_startstop_t *startstop, ide_drive_t *drive, u8 good,

		  u8 bad, unsigned long timeout)

{

	int err;

	u8 stat;
@@ -199,7 +200,6 @@ int ide_wait_stat(ide_startstop_t *startstop, ide_drive_t *drive, u8 good, u8 ba 


	return err;

}



EXPORT_SYMBOL(ide_wait_stat);



/**
@@ -220,7 +220,6 @@ int ide_in_drive_list(u16 *id, const struct drive_list_entry *table) 
			return 1;

	return 0;

}



EXPORT_SYMBOL_GPL(ide_in_drive_list);



/*
@@ -470,7 +469,6 @@ void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, 
	__ide_set_handler(drive, handler, timeout, expiry);

	spin_unlock_irqrestore(&hwif->lock, flags);

}



EXPORT_SYMBOL(ide_set_handler);



/**
@@ -531,10 +529,10 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err) 
static ide_startstop_t do_reset1(ide_drive_t *, int);



/*

 * atapi_reset_pollfunc() gets invoked to poll the interface for completion every 50ms

 * during an atapi drive reset operation. If the drive has not yet responded,

 * and we have not yet hit our maximum waiting time, then the timer is restarted

 * for another 50ms.

 * atapi_reset_pollfunc() gets invoked to poll the interface for completion

 * every 50ms during an atapi drive reset operation.  If the drive has not yet

 * responded, and we have not yet hit our maximum waiting time, then the timer

 * is restarted for another 50ms.

 */

static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)

{
@@ -549,7 +547,8 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) 
		printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);

	else {

		if (time_before(jiffies, hwif->poll_timeout)) {

			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);

			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20,

					NULL);

			/* continue polling */

			return ide_started;

		}
@@ -811,7 +810,6 @@ ide_startstop_t ide_do_reset (ide_drive_t *drive) 
{

	return do_reset1(drive, 0);

}



EXPORT_SYMBOL(ide_do_reset);



/*