Commit 0c06090c authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[WATCHDOG] Coding style - Indentation - part 2 



This brings the watchdog drivers into line with coding style.
This patch takes cares of the indentation as described in chapter 1.
Main changes:
* Re-structure the ioctl switch call for all drivers as follows:
	switch (cmd) {
	case WDIOC_GETSUPPORT:
	case WDIOC_GETSTATUS:
	case WDIOC_GETBOOTSTATUS:
	case WDIOC_GETTEMP:
	case WDIOC_SETOPTIONS:
	case WDIOC_KEEPALIVE:
	case WDIOC_SETTIMEOUT:
	case WDIOC_GETTIMEOUT:
	case WDIOC_GETTIMELEFT:
	default:
	}

This to make the migration from the drivers to the uniform watchdog
device driver easier in the future.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 5eb82498

drivers/watchdog/acquirewdt.c

+7 −7
Original line number Diff line number Diff line
@@ -164,13 +164,6 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);



	case WDIOC_KEEPALIVE:

		acq_keepalive();

		return 0;



	case WDIOC_GETTIMEOUT:

		return put_user(WATCHDOG_HEARTBEAT, p);



	case WDIOC_SETOPTIONS:

	{

		if (get_user(options, p))
@@ -185,6 +178,13 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}

		return retval;

	}

	case WDIOC_KEEPALIVE:

		acq_keepalive();

		return 0;



	case WDIOC_GETTIMEOUT:

		return put_user(WATCHDOG_HEARTBEAT, p);



	default:

		return -ENOTTY;

	}

drivers/watchdog/advantechwdt.c

+13 −13
Original line number Diff line number Diff line
@@ -152,19 +152,6 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);



	case WDIOC_KEEPALIVE:

		advwdt_ping();

		break;



	case WDIOC_SETTIMEOUT:

		if (get_user(new_timeout, p))

			return -EFAULT;

		if (advwdt_set_heartbeat(new_timeout))

			return -EINVAL;

		advwdt_ping();

		/* Fall */

	case WDIOC_GETTIMEOUT:

		return put_user(timeout, p);

	case WDIOC_SETOPTIONS:

	{

		int options, retval = -EINVAL;
@@ -181,6 +168,19 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}

		return retval;

	}

	case WDIOC_KEEPALIVE:

		advwdt_ping();

		break;



	case WDIOC_SETTIMEOUT:

		if (get_user(new_timeout, p))

			return -EFAULT;

		if (advwdt_set_heartbeat(new_timeout))

			return -EINVAL;

		advwdt_ping();

		/* Fall */

	case WDIOC_GETTIMEOUT:

		return put_user(timeout, p);

	default:

		return -ENOTTY;

	}

drivers/watchdog/alim1535_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -195,9 +195,6 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case WDIOC_GETSTATUS:

	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);

	case WDIOC_KEEPALIVE:

		ali_keepalive();

		return 0;

	case WDIOC_SETOPTIONS:

	{

		int new_options, retval = -EINVAL;
@@ -214,6 +211,9 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}

		return retval;

	}

	case WDIOC_KEEPALIVE:

		ali_keepalive();

		return 0;

	case WDIOC_SETTIMEOUT:

	{

		int new_timeout;

drivers/watchdog/alim7101_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -251,9 +251,6 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case WDIOC_GETSTATUS:

	case WDIOC_GETBOOTSTATUS:

		return put_user(0, p);

	case WDIOC_KEEPALIVE:

		wdt_keepalive();

		return 0;

	case WDIOC_SETOPTIONS:

	{

		int new_options, retval = -EINVAL;
@@ -270,6 +267,9 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		}

		return retval;

	}

	case WDIOC_KEEPALIVE:

		wdt_keepalive();

		return 0;

	case WDIOC_SETTIMEOUT:

	{

		int new_timeout;

drivers/watchdog/ar7_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ static long ar7_wdt_ioctl(struct file *file, 
	int new_margin;



	switch (cmd) {

	default:

		return -ENOTTY;

	case WDIOC_GETSUPPORT:

		if (copy_to_user((struct watchdog_info *)arg, &ident,

				sizeof(ident)))
@@ -281,6 +279,8 @@ static long ar7_wdt_ioctl(struct file *file, 
		if (put_user(margin, (int *)arg))

			return -EFAULT;

		return 0;

	default:

		return -ENOTTY;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE