* [PATCH 0/2] comedi: remove checkpatch.pl warnings @ 2019-08-20 23:43 me 2019-08-20 23:43 ` [PATCH 1/2] comedi: remove camelcase me 2019-08-20 23:43 ` [PATCH 2/2] comedi: move #ifdef 0'd stuff to TODO me 0 siblings, 2 replies; 4+ messages in thread From: me @ 2019-08-20 23:43 UTC (permalink / raw) From: Edmund Huber <me@ehuber.info> These changes remove checkpatch.pl warnings from comedi/drivers/ni_pcimio.c . No testing done, all patches build and checkpatch cleanly. Edmund Huber (2): comedi: remove camelcase comedi: move #ifdef 0'd stuff to TODO drivers/staging/comedi/TODO | 1 + drivers/staging/comedi/drivers/ni_pcimio.c | 52 +--------------------- 2 files changed, 3 insertions(+), 50 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] comedi: remove camelcase 2019-08-20 23:43 [PATCH 0/2] comedi: remove checkpatch.pl warnings me @ 2019-08-20 23:43 ` me 2019-08-21 2:37 ` Greg KH 2019-08-20 23:43 ` [PATCH 2/2] comedi: move #ifdef 0'd stuff to TODO me 1 sibling, 1 reply; 4+ messages in thread From: me @ 2019-08-20 23:43 UTC (permalink / raw) From: Edmund Huber <me@ehuber.info> --- drivers/staging/comedi/drivers/ni_pcimio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 14b26fffe..e2e64e234 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -1212,7 +1212,7 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev) struct ni_private *devpriv = dev->private; struct mite *mite = devpriv->mite; resource_size_t daq_phys_addr; - static const int Start_Cal_EEPROM = 0x400; + static const int start_cal_eeprom = 0x400; static const unsigned int window_size = 10; unsigned int old_iodwbsr_bits; unsigned int old_iodwbsr1_bits; @@ -1232,7 +1232,7 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev) writel(0xf, mite->mmio + 0x30); for (i = 0; i < M_SERIES_EEPROM_SIZE; ++i) - devpriv->eeprom_buffer[i] = ni_readb(dev, Start_Cal_EEPROM + i); + devpriv->eeprom_buffer[i] = ni_readb(dev, start_cal_eeprom + i); writel(old_iodwbsr1_bits, mite->mmio + MITE_IODWBSR_1); writel(old_iodwbsr_bits, mite->mmio + MITE_IODWBSR); -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] comedi: remove camelcase 2019-08-20 23:43 ` [PATCH 1/2] comedi: remove camelcase me @ 2019-08-21 2:37 ` Greg KH 0 siblings, 0 replies; 4+ messages in thread From: Greg KH @ 2019-08-21 2:37 UTC (permalink / raw) On Tue, Aug 20, 2019@11:43:06PM +0000, me@ehuber.info wrote: > From: Edmund Huber <me at ehuber.info> > > --- > drivers/staging/comedi/drivers/ni_pcimio.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I don't think you read all of the issues that my patchbot sent you. Please re-read that and fix up those issues and then resend the patch series. If you have any questions about the issues it found, please let us know. thanks, greg k-h ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] comedi: move #ifdef 0'd stuff to TODO 2019-08-20 23:43 [PATCH 0/2] comedi: remove checkpatch.pl warnings me 2019-08-20 23:43 ` [PATCH 1/2] comedi: remove camelcase me @ 2019-08-20 23:43 ` me 1 sibling, 0 replies; 4+ messages in thread From: me @ 2019-08-20 23:43 UTC (permalink / raw) From: Edmund Huber <me@ehuber.info> --- drivers/staging/comedi/TODO | 1 + drivers/staging/comedi/drivers/ni_pcimio.c | 48 ---------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/drivers/staging/comedi/TODO b/drivers/staging/comedi/TODO index f733c017f..4fe1028ca 100644 --- a/drivers/staging/comedi/TODO +++ b/drivers/staging/comedi/TODO @@ -5,6 +5,7 @@ TODO: - audit userspace interface - Fix coverity 1195261 - cleanup the individual comedi drivers as well + - maybe add drivers for BOARD_PCI6115, BOARD_PXI6115, BOARD_PXI6731 (see history on ni_pcimio.c) Please send patches to Greg Kroah-Hartman <greg at kroah.com> and copy: diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index e2e64e234..aadba7e31 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -481,43 +481,6 @@ static const struct ni_board_struct ni_boards[] = { .ao_speed = 250, .caldac = { ad8804, ad8804 }, }, -#if 0 - /* The 6115 boards probably need their own driver */ - [BOARD_PCI6115] = { /* .device_id = 0x2ed0, */ - .name = "pci-6115", - .n_adchan = 4, - .ai_maxdata = 0x0fff, - .ai_fifo_depth = 8192, - .gainlkup = ai_gain_611x, - .ai_speed = 100, - .n_aochan = 2, - .ao_maxdata = 0xffff, - .ao_671x = 1, - .ao_fifo_depth = 2048, - .ao_speed = 250, - .reg_611x = 1, - /* XXX */ - .caldac = { ad8804_debug, ad8804_debug, ad8804_debug }, - }, -#endif -#if 0 - [BOARD_PXI6115] = { /* .device_id = ????, */ - .name = "pxi-6115", - .n_adchan = 4, - .ai_maxdata = 0x0fff, - .ai_fifo_depth = 8192, - .gainlkup = ai_gain_611x, - .ai_speed = 100, - .n_aochan = 2, - .ao_maxdata = 0xffff, - .ao_671x = 1, - .ao_fifo_depth = 2048, - .ao_speed = 250, - .reg_611x = 1, - /* XXX */ - .caldac = { ad8804_debug, ad8804_debug, ad8804_debug }, - }, -#endif [BOARD_PCI6711] = { .name = "pci-6711", .n_aochan = 4, @@ -569,17 +532,6 @@ static const struct ni_board_struct ni_boards[] = { .reg_type = ni_reg_6711, .caldac = { ad8804_debug }, }, -#if 0 - [BOARD_PXI6731] = { /* .device_id = ????, */ - .name = "pxi-6731", - .n_aochan = 4, - .ao_maxdata = 0xffff, - .ao_fifo_depth = 8192, - .ao_range_table = &range_bipolar10, - .reg_type = ni_reg_6711, - .caldac = { ad8804_debug }, - }, -#endif [BOARD_PCI6733] = { .name = "pci-6733", .n_aochan = 8, -- 2.17.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-21 2:37 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-20 23:43 [PATCH 0/2] comedi: remove checkpatch.pl warnings me 2019-08-20 23:43 ` [PATCH 1/2] comedi: remove camelcase me 2019-08-21 2:37 ` Greg KH 2019-08-20 23:43 ` [PATCH 2/2] comedi: move #ifdef 0'd stuff to TODO me
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).