Commit 00a925ee authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

char/mwave: drop typedefs 



typedefs are unnecessary here. They rather obfuscate the code than help.
So drop them and use the types directly.

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20251119091949.825958-7-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c7e15b0

drivers/char/mwave/3780i.c

+4 −4
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void dsp3780I_WriteGenCfg(unsigned short usDspBaseIO, unsigned uIndex, 
	OutByteDsp(DSP_IsaSlaveControl, MKBYTE(rSlaveControl_Save));

}



int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,

int dsp3780I_EnableDSP(struct dsp_3780i_config_settings *pSettings,

                       unsigned short *pIrqMap,

                       unsigned short *pDmaMap)

{
@@ -260,7 +260,7 @@ int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings, 
	return 0;

}



int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings)

int dsp3780I_DisableDSP(struct dsp_3780i_config_settings *pSettings)

{

	unsigned long flags;

	unsigned short usDspBaseIO = pSettings->usDspBaseIO;
@@ -284,7 +284,7 @@ int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings) 
	return 0;

}



int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings)

int dsp3780I_Reset(struct dsp_3780i_config_settings *pSettings)

{

	unsigned long flags;

	unsigned short usDspBaseIO = pSettings->usDspBaseIO;
@@ -317,7 +317,7 @@ int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings) 
}





int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings)

int dsp3780I_Run(struct dsp_3780i_config_settings *pSettings)

{

	unsigned long flags;

	unsigned short usDspBaseIO = pSettings->usDspBaseIO;

drivers/char/mwave/3780i.h

+6 −6
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ typedef struct { 
* the only values maintained by the 3780i support layer are the saved UART

* registers.

*/

typedef struct _DSP_3780I_CONFIG_SETTINGS {

struct dsp_3780i_config_settings {



	/* Location of base configuration register */

	unsigned short usBaseConfigIO;
@@ -313,16 +313,16 @@ typedef struct _DSP_3780I_CONFIG_SETTINGS { 
	unsigned char ucSCR;	/* Scratch register */

	unsigned char ucDLL;	/* Divisor latch, low byte */

	unsigned char ucDLM;	/* Divisor latch, high byte */

} DSP_3780I_CONFIG_SETTINGS;

};





/* 3780i support functions */

int dsp3780I_EnableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings,

int dsp3780I_EnableDSP(struct dsp_3780i_config_settings *pSettings,

                       unsigned short *pIrqMap,

                       unsigned short *pDmaMap);

int dsp3780I_DisableDSP(DSP_3780I_CONFIG_SETTINGS * pSettings);

int dsp3780I_Reset(DSP_3780I_CONFIG_SETTINGS * pSettings);

int dsp3780I_Run(DSP_3780I_CONFIG_SETTINGS * pSettings);

int dsp3780I_DisableDSP(struct dsp_3780i_config_settings *pSettings);

int dsp3780I_Reset(struct dsp_3780i_config_settings *pSettings);

int dsp3780I_Run(struct dsp_3780i_config_settings *pSettings);

int dsp3780I_ReadDStore(unsigned short usDspBaseIO, void __user *pvBuffer,

                        unsigned uCount, unsigned long ulDSPAddr);

int dsp3780I_ReadAndClearDStore(unsigned short usDspBaseIO,

drivers/char/mwave/mwavedd.c

+15 −19
Original line number Diff line number Diff line
@@ -86,13 +86,13 @@ module_param_hw(mwave_3780i_io, int, ioport, 0); 
module_param_hw(mwave_uart_irq, int, irq, 0);

module_param_hw(mwave_uart_io, int, ioport, 0);



MWAVE_DEVICE_DATA mwave_s_mdd;

struct mwave_device_data mwave_s_mdd;



static long mwave_ioctl(struct file *file, unsigned int iocmd,

							unsigned long ioarg)

{

	unsigned int retval = 0;

	pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;

	struct mwave_device_data *pDrvData = &mwave_s_mdd;

	void __user *arg = (void __user *)ioarg;



	switch (iocmd) {
@@ -110,15 +110,14 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, 
			break;

	

		case IOCTL_MW_DSP_ABILITIES: {

			MW_ABILITIES rAbilities;

			struct mw_abilities rAbilities;

	

			mutex_lock(&mwave_mutex);

			retval = tp3780I_QueryAbilities(&pDrvData->rBDData,

					&rAbilities);

			mutex_unlock(&mwave_mutex);

			if (retval == 0) {

				if( copy_to_user(arg, &rAbilities,

							sizeof(MW_ABILITIES)) )

				if (copy_to_user(arg, &rAbilities, sizeof(rAbilities)))

					return -EFAULT;

			}

		}
@@ -126,11 +125,11 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, 
	

		case IOCTL_MW_READ_DATA:

		case IOCTL_MW_READCLEAR_DATA: {

			MW_READWRITE rReadData;

			struct mw_readwrite rReadData;

			unsigned short __user *pusBuffer = NULL;

	

			if( copy_from_user(&rReadData, arg,

						sizeof(MW_READWRITE)) )

						sizeof(struct mw_readwrite)) )

				return -EFAULT;

			pusBuffer = (unsigned short __user *) (rReadData.pBuf);
@@ -145,11 +144,10 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, 
			break;

	

		case IOCTL_MW_READ_INST: {

			MW_READWRITE rReadData;

			struct mw_readwrite rReadData;

			unsigned short __user *pusBuffer = NULL;

	

			if( copy_from_user(&rReadData, arg,

						sizeof(MW_READWRITE)) )

			if (copy_from_user(&rReadData, arg, sizeof(rReadData)))

				return -EFAULT;

			pusBuffer = (unsigned short __user *) (rReadData.pBuf);
@@ -163,11 +161,10 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, 
			break;

	

		case IOCTL_MW_WRITE_DATA: {

			MW_READWRITE rWriteData;

			struct mw_readwrite rWriteData;

			unsigned short __user *pusBuffer = NULL;

	

			if( copy_from_user(&rWriteData, arg,

						sizeof(MW_READWRITE)) )

			if (copy_from_user(&rWriteData, arg, sizeof(rWriteData)))

				return -EFAULT;

			pusBuffer = (unsigned short __user *) (rWriteData.pBuf);
@@ -181,11 +178,10 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, 
			break;

	

		case IOCTL_MW_WRITE_INST: {

			MW_READWRITE rWriteData;

			struct mw_readwrite rWriteData;

			unsigned short __user *pusBuffer = NULL;

	

			if( copy_from_user(&rWriteData, arg,

						sizeof(MW_READWRITE)) )

			if (copy_from_user(&rWriteData, arg, sizeof(rWriteData)))

				return -EFAULT;

			pusBuffer = (unsigned short __user *)(rWriteData.pBuf);
@@ -336,7 +332,7 @@ static struct miscdevice mwave_misc_dev = { MWAVE_MINOR, "mwave", &mwave_fops }; 
*/

static void mwave_exit(void)

{

	pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;

	struct mwave_device_data *pDrvData = &mwave_s_mdd;



	if ( pDrvData->sLine >= 0 ) {

		serial8250_unregister_port(pDrvData->sLine);
@@ -361,9 +357,9 @@ static int __init mwave_init(void) 
{

	int i;

	int retval = 0;

	pMWAVE_DEVICE_DATA pDrvData = &mwave_s_mdd;

	struct mwave_device_data *pDrvData = &mwave_s_mdd;



	memset(&mwave_s_mdd, 0, sizeof(MWAVE_DEVICE_DATA));

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



	pDrvData->bBDInitialized = false;

	pDrvData->bResourcesClaimed = false;

drivers/char/mwave/mwavedd.h

+7 −7
Original line number Diff line number Diff line
@@ -61,30 +61,30 @@ extern int mwave_3780i_io; 
extern int mwave_uart_irq;

extern int mwave_uart_io;



typedef struct _MWAVE_IPC {

struct mwave_ipc {

	unsigned short usIntCount;	/* 0=none, 1=first, 2=greater than 1st */

	bool bIsEnabled;

	bool bIsHere;

	/* entry spin lock */

	wait_queue_head_t ipc_wait_queue;

} MWAVE_IPC;

};



typedef struct _MWAVE_DEVICE_DATA {

	THINKPAD_BD_DATA rBDData;	/* board driver's data area */

struct mwave_device_data {

	struct thinkpad_bd_data rBDData;	/* board driver's data area */

	unsigned long ulIPCSource_ISR;	/* IPC source bits for recently processed intr, set during ISR processing */

	unsigned long ulIPCSource_DPC;	/* IPC source bits for recently processed intr, set during DPC processing */

	bool bBDInitialized;

	bool bResourcesClaimed;

	bool bDSPEnabled;

	bool bDSPReset;

	MWAVE_IPC IPCs[16];

	struct mwave_ipc IPCs[16];

	bool bMwaveDevRegistered;

	short sLine;

	int nr_registered_attrs;

	int device_registered;



} MWAVE_DEVICE_DATA, *pMWAVE_DEVICE_DATA;

};



extern MWAVE_DEVICE_DATA mwave_s_mdd;

extern struct mwave_device_data mwave_s_mdd;



#endif

drivers/char/mwave/mwavepub.h

+11 −11
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include <linux/miscdevice.h>





typedef struct _MW_ABILITIES {

struct mw_abilities {

	unsigned long instr_per_sec;

	unsigned long data_size;

	unsigned long inst_size;
@@ -63,27 +63,27 @@ typedef struct _MW_ABILITIES { 
	unsigned long component_list[7];

	char mwave_os_name[16];

	char bios_task_name[16];

} MW_ABILITIES, *pMW_ABILITIES;

};





typedef struct _MW_READWRITE {

struct mw_readwrite {

	unsigned short usDspAddress;	/* The dsp address */

	unsigned long ulDataLength;	/* The size in bytes of the data or user buffer */

	void __user *pBuf;		/* Input:variable sized buffer */

} MW_READWRITE, *pMW_READWRITE;

};



#define IOCTL_MW_RESET           _IO(MWAVE_MINOR,1)

#define IOCTL_MW_RUN             _IO(MWAVE_MINOR,2)

#define IOCTL_MW_DSP_ABILITIES   _IOR(MWAVE_MINOR,3,MW_ABILITIES)

#define IOCTL_MW_READ_DATA       _IOR(MWAVE_MINOR,4,MW_READWRITE)

#define IOCTL_MW_READCLEAR_DATA  _IOR(MWAVE_MINOR,5,MW_READWRITE)

#define IOCTL_MW_READ_INST       _IOR(MWAVE_MINOR,6,MW_READWRITE)

#define IOCTL_MW_WRITE_DATA      _IOW(MWAVE_MINOR,7,MW_READWRITE)

#define IOCTL_MW_WRITE_INST      _IOW(MWAVE_MINOR,8,MW_READWRITE)

#define IOCTL_MW_DSP_ABILITIES   _IOR(MWAVE_MINOR,3,struct mw_abilities)

#define IOCTL_MW_READ_DATA       _IOR(MWAVE_MINOR,4,struct mw_readwrite)

#define IOCTL_MW_READCLEAR_DATA  _IOR(MWAVE_MINOR,5,struct mw_readwrite)

#define IOCTL_MW_READ_INST       _IOR(MWAVE_MINOR,6,struct mw_readwrite)

#define IOCTL_MW_WRITE_DATA      _IOW(MWAVE_MINOR,7,struct mw_readwrite)

#define IOCTL_MW_WRITE_INST      _IOW(MWAVE_MINOR,8,struct mw_readwrite)

#define IOCTL_MW_REGISTER_IPC    _IOW(MWAVE_MINOR,9,int)

#define IOCTL_MW_UNREGISTER_IPC  _IOW(MWAVE_MINOR,10,int)

#define IOCTL_MW_GET_IPC         _IOW(MWAVE_MINOR,11,int)

#define IOCTL_MW_TRACE           _IOR(MWAVE_MINOR,12,MW_READWRITE)

#define IOCTL_MW_TRACE           _IOR(MWAVE_MINOR,12,struct mw_readwrite)





#endif