All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hartley Sweeten <HartleyS@visionengravers.com>
To: Ian Abbott <abbotti@mev.co.uk>,
	"driverdev-devel@linuxdriverproject.org" 
	<driverdev-devel@linuxdriverproject.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 11/11] staging: comedi: remove comedi_fc module
Date: Mon, 15 Sep 2014 18:07:07 +0000	[thread overview]
Message-ID: <DC148C5AA1CEBA4E87973D432B1C2D8825FA1B2F@P3PWEX4MB008.ex4.secureserver.net> (raw)
In-Reply-To: <1410785167-28506-12-git-send-email-abbotti@mev.co.uk>

On Monday, September 15, 2014 5:46 AM, Ian Abbott wrote:
> All the exported functions in the "comedi_fc" module have been migrated
> to the core "comedi" module and renamed, so it is now just a dummy
> module.  Remove it.
>
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> ---
> drivers/staging/comedi/Kconfig             | 31 ------------------------
>  drivers/staging/comedi/drivers/Makefile    |  1 -
>  drivers/staging/comedi/drivers/comedi_fc.c | 38 ------------------------------
>  3 files changed, 70 deletions(-)
>  delete mode 100644 drivers/staging/comedi/drivers/comedi_fc.c
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index fd5f939..ea4948f 100644
> --- a/drivers/staging/comedi/Kconfig
> +++ b/drivers/staging/comedi/Kconfig

[snip]

> @@ -678,7 +667,6 @@ config COMEDI_ADDI_APCI_2200
>  config COMEDI_ADDI_APCI_3120
>  	tristate "ADDI-DATA APCI_3120/3001 support"
>  	depends on VIRT_TO_BUS
> -	select COMEDI_FC
>  	---help---
>  	  Enable support for ADDI-DATA APCI_3120/3001 cards

Ian,

I'm not sure of the patch order for this series and your:
" [PATCH 0/4] staging: comedi: addi_apci_3120: redo DMA buffer allocation"

This patch has a conflict with 3/4 of that series:

config COMEDI_ADDI_APCI_3120
	tristate "ADDI-DATA APCI_3120/3001 support"
	depends on HAS_DMA
	select COMEDI_FC
	---help---
	  Enable support for ADDI-DATA APCI_3120/3001 cards

Regards,
Hartley


WARNING: multiple messages have this Message-ID (diff)
From: Hartley Sweeten <HartleyS@visionengravers.com>
To: Ian Abbott <abbotti@mev.co.uk>,
	"driverdev-devel@linuxdriverproject.org"
	<driverdev-devel@linuxdriverproject.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 11/11] staging: comedi: remove comedi_fc module
Date: Mon, 15 Sep 2014 18:07:07 +0000	[thread overview]
Message-ID: <DC148C5AA1CEBA4E87973D432B1C2D8825FA1B2F@P3PWEX4MB008.ex4.secureserver.net> (raw)
In-Reply-To: <1410785167-28506-12-git-send-email-abbotti@mev.co.uk>

On Monday, September 15, 2014 5:46 AM, Ian Abbott wrote:
> All the exported functions in the "comedi_fc" module have been migrated
> to the core "comedi" module and renamed, so it is now just a dummy
> module.  Remove it.
>
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> ---
> drivers/staging/comedi/Kconfig             | 31 ------------------------
>  drivers/staging/comedi/drivers/Makefile    |  1 -
>  drivers/staging/comedi/drivers/comedi_fc.c | 38 ------------------------------
>  3 files changed, 70 deletions(-)
>  delete mode 100644 drivers/staging/comedi/drivers/comedi_fc.c
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index fd5f939..ea4948f 100644
> --- a/drivers/staging/comedi/Kconfig
> +++ b/drivers/staging/comedi/Kconfig

[snip]

> @@ -678,7 +667,6 @@ config COMEDI_ADDI_APCI_2200
>  config COMEDI_ADDI_APCI_3120
>  	tristate "ADDI-DATA APCI_3120/3001 support"
>  	depends on VIRT_TO_BUS
> -	select COMEDI_FC
>  	---help---
>  	  Enable support for ADDI-DATA APCI_3120/3001 cards

Ian,

I'm not sure of the patch order for this series and your:
" [PATCH 0/4] staging: comedi: addi_apci_3120: redo DMA buffer allocation"

This patch has a conflict with 3/4 of that series:

config COMEDI_ADDI_APCI_3120
	tristate "ADDI-DATA APCI_3120/3001 support"
	depends on HAS_DMA
	select COMEDI_FC
	---help---
	  Enable support for ADDI-DATA APCI_3120/3001 cards

Regards,
Hartley

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  reply	other threads:[~2014-09-15 18:07 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-15 12:45 [PATCH 00/11] staging: comedi: move comedi_fc functionality into core Ian Abbott
2014-09-15 12:45 ` Ian Abbott
2014-09-15 12:45 ` [PATCH 01/11] staging: comedi: add comedi_bytes_per_scan() Ian Abbott
2014-09-15 12:45   ` Ian Abbott
2014-09-15 18:12   ` Hartley Sweeten
2014-09-15 18:12     ` Hartley Sweeten
2014-09-15 12:45 ` [PATCH 02/11] staging: comedi: comedi_fc: use comedi_bytes_per_scan() Ian Abbott
2014-09-15 12:45   ` Ian Abbott
2014-09-15 12:45 ` [PATCH 03/11] staging: comedi: add comedi_inc_scan_progress() Ian Abbott
2014-09-15 12:45   ` Ian Abbott
2014-09-15 18:14   ` Hartley Sweeten
2014-09-15 18:14     ` Hartley Sweeten
2014-09-15 12:46 ` [PATCH 04/11] staging: comedi: comedi_fc: use comedi_inc_scan_progress() Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 05/11] staging: comedi: add comedi_handle_events() Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 18:17   ` Hartley Sweeten
2014-09-15 18:17     ` Hartley Sweeten
2014-09-15 12:46 ` [PATCH 06/11] staging: comedi: comedi_fc: cfc_write_array_to_buffer() data is const Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 07/11] staging: comedi: add comedi_write_array_to_buffer() Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 08/11] staging: comedi: comedi_fc.h: use comedi_write_array_to_buffer() Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 09/11] staging: comedi: add comedi_read_array_from_buffer() Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 10/11] staging: comedi: migrate copyrights from "comedi_fc.c" Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 12:46 ` [PATCH 11/11] staging: comedi: remove comedi_fc module Ian Abbott
2014-09-15 12:46   ` Ian Abbott
2014-09-15 18:07   ` Hartley Sweeten [this message]
2014-09-15 18:07     ` Hartley Sweeten
2014-09-15 18:21 ` [PATCH 00/11] staging: comedi: move comedi_fc functionality into core Hartley Sweeten
2014-09-15 18:21   ` Hartley Sweeten
2014-09-16  7:44   ` Ian Abbott
2014-09-16  7:44     ` Ian Abbott
2014-09-16 16:13     ` Hartley Sweeten
2014-09-16 16:13       ` Hartley Sweeten

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DC148C5AA1CEBA4E87973D432B1C2D8825FA1B2F@P3PWEX4MB008.ex4.secureserver.net \
    --to=hartleys@visionengravers.com \
    --cc=abbotti@mev.co.uk \
    --cc=driverdev-devel@linuxdriverproject.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.