staging: open braces in ft1000_debug.c and ioctl.h (52adc0b4) · Commits · 戴 / test

drivers/staging/ft1000/ft1000-usb/ft1000_debug.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -57,8 +57,7 @@ int numofmsgbuf = 0;
		/*
		* Table of entry-point routines for char device
		*/
		static const struct file_operations ft1000fops =
		{
		static const struct file_operations ft1000fops = {
		.unlocked_ioctl = ft1000_ioctl,
		.poll = ft1000_poll_dev,
		.open = ft1000_open,
		@@ -158,8 +157,7 @@ int ft1000_create_dev(struct ft1000_usb *dev)
		DEBUG("%s: number of instance = %d\n", __func__, ft1000_flarion_cnt);
		DEBUG("DeviceCreated = %x\n", dev->DeviceCreated);

		if (dev->DeviceCreated)
		{
		if (dev->DeviceCreated) {
		DEBUG("%s: \"%s\" already registered\n", __func__, dev->DeviceName);
		return -EIO;
		}
		@@ -248,8 +246,7 @@ void ft1000_destroy_dev(struct net_device *netdev)



		if (dev->DeviceCreated)
		{
		if (dev->DeviceCreated) {
		ft1000_flarion_cnt--;
		list_for_each_safe(pos, q, &dev->nodes.list) {
		dir = list_entry(pos, struct ft1000_debug_dirs, list);
		@@ -719,8 +716,7 @@ static long ft1000_ioctl (struct file *file, unsigned int command,
		break;
		msglen = htons(msglen);
		/* DEBUG("FT1000:ft1000_ioctl:msg length = %x\n", msglen); */
		if(copy_to_user (&pioctl_dpram->pseudohdr, pdpram_blk->pbuffer, msglen))
		{
		if(copy_to_user (&pioctl_dpram->pseudohdr, pdpram_blk->pbuffer, msglen)) {
		DEBUG("FT1000:ft1000_ioctl: copy fault occurred\n");
		result = -EFAULT;
		break;

+4 −8

Original line number	Diff line number	Diff line
		@@ -28,14 +28,12 @@
		#ifndef _FT1000IOCTLH_
		#define _FT1000IOCTLH_

		typedef struct _IOCTL_GET_VER
		{
		typedef struct _IOCTL_GET_VER {
		unsigned long drv_ver;
		} __attribute__ ((packed)) IOCTL_GET_VER, *PIOCTL_GET_VER;

		/* Data structure for Dsp statistics */
		typedef struct _IOCTL_GET_DSP_STAT
		{
		typedef struct _IOCTL_GET_DSP_STAT {
		unsigned char DspVer[DSPVERSZ]; /* DSP version number */
		unsigned char HwSerNum[HWSERNUMSZ]; /* Hardware Serial Number */
		unsigned char Sku[SKUSZ]; /* SKU */
		@@ -72,15 +70,13 @@ typedef struct _IOCTL_GET_DSP_STAT
		} __attribute__ ((packed)) IOCTL_GET_DSP_STAT, *PIOCTL_GET_DSP_STAT;

		/* Data structure for Dual Ported RAM messaging between Host and Dsp */
		typedef struct _IOCTL_DPRAM_BLK
		{
		typedef struct _IOCTL_DPRAM_BLK {
		unsigned short total_len;
		struct pseudo_hdr pseudohdr;
		unsigned char buffer[1780];
		} __attribute__ ((packed)) IOCTL_DPRAM_BLK, *PIOCTL_DPRAM_BLK;

		typedef struct _IOCTL_DPRAM_COMMAND
		{
		typedef struct _IOCTL_DPRAM_COMMAND {
		unsigned short extra;
		IOCTL_DPRAM_BLK dpram_blk;
		} __attribute__ ((packed)) IOCTL_DPRAM_COMMAND, *PIOCTL_DPRAM_COMMAND;