microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Staging: comedi: drivers.c sparse cleanup 

Fix up some sparse issues in drivers.c

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-05-03 15:55:45 -07:00
Родитель 3b6b25b5dd
Коммит 7029a87455
3 изменённых файлов: 11 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
drivers/staging/comedi/comedidev.h
Просмотреть файл

@ -351,9 +351,6 @@ void cleanup_polling(void);
void start_polling(struct comedi_device *); void start_polling(struct comedi_device *);
void stop_polling(struct comedi_device *); void stop_polling(struct comedi_device *);
int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
void comedi_proc_init(void); void comedi_proc_init(void);
void comedi_proc_cleanup(void); void comedi_proc_cleanup(void);

24
drivers/staging/comedi/drivers.c
Просмотреть файл

@ -54,16 +54,9 @@ static int insn_rw_emulate_bits(struct comedi_device *dev,
static void *comedi_recognize(struct comedi_driver *driv, const char *name); static void *comedi_recognize(struct comedi_driver *driv, const char *name);
static void comedi_report_boards(struct comedi_driver *driv); static void comedi_report_boards(struct comedi_driver *driv);
static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s); static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s);
int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size);
struct comedi_driver *comedi_drivers; struct comedi_driver *comedi_drivers;
int comedi_modprobe(int minor)
{
return -EINVAL;
}
static void cleanup_device(struct comedi_device *dev) static void cleanup_device(struct comedi_device *dev)
{ {
int i; int i;
@ -84,7 +77,7 @@ static void cleanup_device(struct comedi_device *dev)
} }
kfree(dev->private); kfree(dev->private);
dev->private = NULL; dev->private = NULL;
dev->driver = 0; dev->driver = NULL;
dev->board_name = NULL; dev->board_name = NULL;
dev->board_ptr = NULL; dev->board_ptr = NULL;
dev->iobase = 0; dev->iobase = 0;
@ -309,7 +302,7 @@ static int postconfig(struct comedi_device *dev)
/* generic recognize function for drivers /* generic recognize function for drivers
* that register their supported board names */ * that register their supported board names */
void *comedi_recognize(struct comedi_driver *driv, const char *name) static void *comedi_recognize(struct comedi_driver *driv, const char *name)
{ {
unsigned i; unsigned i;
const char *const *name_ptr = driv->board_name; const char *const *name_ptr = driv->board_name;
@ -324,7 +317,7 @@ void *comedi_recognize(struct comedi_driver *driv, const char *name)
return NULL; return NULL;
} }
void comedi_report_boards(struct comedi_driver *driv) static void comedi_report_boards(struct comedi_driver *driv)
{ {
unsigned int i; unsigned int i;
const char *const *name_ptr; const char *const *name_ptr;
@ -548,8 +541,8 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
/* munging is applied to data by core as it passes between user /* munging is applied to data by core as it passes between user
* and kernel space */ * and kernel space */
unsigned int comedi_buf_munge(struct comedi_async *async, static unsigned int comedi_buf_munge(struct comedi_async *async,
unsigned int num_bytes) unsigned int num_bytes)
{ {
struct comedi_subdevice *s = async->subdevice; struct comedi_subdevice *s = async->subdevice;
unsigned int count = 0; unsigned int count = 0;
@ -812,8 +805,9 @@ void comedi_reset_async_buf(struct comedi_async *async)
async->events = 0; async->events = 0;
} }
int comedi_auto_config(struct device *hardware_device, const char *board_name, static int comedi_auto_config(struct device *hardware_device,
const int *options, unsigned num_options) const char *board_name, const int *options,
unsigned num_options)
{ {
struct comedi_devconfig it; struct comedi_devconfig it;
int minor; int minor;
@ -858,7 +852,7 @@ cleanup:
return retval; return retval;
} }
void comedi_auto_unconfig(struct device *hardware_device) static void comedi_auto_unconfig(struct device *hardware_device)
{ {
unsigned *minor = (unsigned *)dev_get_drvdata(hardware_device); unsigned *minor = (unsigned *)dev_get_drvdata(hardware_device);
if (minor == NULL) if (minor == NULL)

2
drivers/staging/comedi/internal.h
Просмотреть файл

@ -8,3 +8,5 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
int comedi_alloc_board_minor(struct device *hardware_device); int comedi_alloc_board_minor(struct device *hardware_device);
void comedi_free_board_minor(unsigned minor); void comedi_free_board_minor(unsigned minor);
void comedi_reset_async_buf(struct comedi_async *async); void comedi_reset_async_buf(struct comedi_async *async);
int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size);