[PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[Javier Martinez Canillas]

This patch is the first one of a patchset that allows 
stagin/spectra driver to compile in linux-next. 

blk_queue_ordered doesn't receive a prepare flush function anymore

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/staging/spectra/ffsport.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
index d0c5c97..eca6536 100644
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
@@ -272,13 +272,6 @@ static int get_res_blk_num_os(void)
 	return res_blks;
 }
 
-static void SBD_prepare_flush(struct request_queue *q, struct request *rq)
-{
-	rq->cmd_type = REQ_TYPE_LINUX_BLOCK;
-	/* rq->timeout = 5 * HZ; */
-	rq->cmd[0] = REQ_LB_OP_FLUSH;
-}
-
 /* Transfer a full request. */
 static int do_transfer(struct spectra_nand_dev *tr, struct request *req)
 {
@@ -650,8 +643,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
 	/* Here we force report 512 byte hardware sector size to Kernel */
 	blk_queue_logical_block_size(dev->queue, 512);
 
-	blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH,
-					SBD_prepare_flush);
+	blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH);
 
 	dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd");
 	if (IS_ERR(dev->thread)) {
-- 
1.7.0.4

Re: [PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[Randy Dunlap]

On 07/09/10 20:25, Javier Martinez Canillas wrote:
> This patch is the first one of a patchset that allows 
> stagin/spectra driver to compile in linux-next. 
> 
> blk_queue_ordered doesn't receive a prepare flush function anymore
> 
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>

These 3 patches fix the build errors.
There are still some warnings that should be addressed.

Thanks.

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>


> ---
>  drivers/staging/spectra/ffsport.c |   10 +---------
>  1 files changed, 1 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
> index d0c5c97..eca6536 100644
> --- a/drivers/staging/spectra/ffsport.c
> +++ b/drivers/staging/spectra/ffsport.c
> @@ -272,13 +272,6 @@ static int get_res_blk_num_os(void)
>  	return res_blks;
>  }
>  
> -static void SBD_prepare_flush(struct request_queue *q, struct request *rq)
> -{
> -	rq->cmd_type = REQ_TYPE_LINUX_BLOCK;
> -	/* rq->timeout = 5 * HZ; */
> -	rq->cmd[0] = REQ_LB_OP_FLUSH;
> -}
> -
>  /* Transfer a full request. */
>  static int do_transfer(struct spectra_nand_dev *tr, struct request *req)
>  {
> @@ -650,8 +643,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
>  	/* Here we force report 512 byte hardware sector size to Kernel */
>  	blk_queue_logical_block_size(dev->queue, 512);
>  
> -	blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH,
> -					SBD_prepare_flush);
> +	blk_queue_ordered(dev->queue, QUEUE_ORDERED_DRAIN_FLUSH);
>  
>  	dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd");
>  	if (IS_ERR(dev->thread)) {


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[Javier Martinez Canillas]

>
> These 3 patches fix the build errors.
> There are still some warnings that should be addressed.
>
> Thanks.
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>
>

Thanks a lot for reviewing the patches. I can address the warnings.
Should I send patches as a delta of these three patches or do I resend
a patchset containing  these three and the others that will address
the warnings?

Best regards,

-----------------------------------------
Javier Martínez Canillas
+595 981 88 66 58
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[Randy Dunlap]

On 07/15/10 18:24, Javier Martinez Canillas wrote:
>>
>> These 3 patches fix the build errors.
>> There are still some warnings that should be addressed.
>>
>> Thanks.
>>
>> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>>
>>
> 
> Thanks a lot for reviewing the patches. I can address the warnings.
> Should I send patches as a delta of these three patches or do I resend
> a patchset containing  these three and the others that will address
> the warnings?

Greg, which do you prefer?

I would just send more patches as deltas, but it's up to Greg.
AFAIK, he hasn't applied these 3 yet.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[David Woodhouse]

On Fri, 2010-07-16 at 15:14 +0100, Randy Dunlap wrote:
> On 07/15/10 18:24, Javier Martinez Canillas wrote:
> >>
> >> These 3 patches fix the build errors.
> >> There are still some warnings that should be addressed.
> >>
> >> Thanks.
> >>
> >> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> >>
> >>
> > 
> > Thanks a lot for reviewing the patches. I can address the warnings.
> > Should I send patches as a delta of these three patches or do I resend
> > a patchset containing  these three and the others that will address
> > the warnings?
> 
> Greg, which do you prefer?
> 
> I would just send more patches as deltas, but it's up to Greg.
> AFAIK, he hasn't applied these 3 yet.

Or should I keep a tree for the spectra driver, apply patches to *that*
and ask Greg to pull from it?

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: [PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn

[Javier Martinez Canillas]

>>>
>>> These 3 patches fix the build errors.
>>> There are still some warnings that should be addressed.
>>>
>>> Thanks.
>>>
>>> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>>>
>>>
>>
>> Thanks a lot for reviewing the patches. I can address the warnings.
>> Should I send patches as a delta of these three patches or do I resend
>> a patchset containing  these three and the others that will address
>> the warnings?
>
> Greg, which do you prefer?
>
> I would just send more patches as deltas, but it's up to Greg.
> AFAIK, he hasn't applied these 3 yet.
>

I prepared another patchset that removes all the warnings. This patches are a delta from the previous patchset so it assumes that these three patches all already applied:

[PATCH 1/3] fix staging/spectra: removes q->prepare_flush_fn
[PATCH 2/3] fix staging/spectra: use new REQ_FLUSH flag
[PATCH 3/3] fix staging/spectra: don't use locked_ioctl

The new patchset contains the following patches:

[PATCH 1/4] staging/spectra: remove duplicate GLOB_VERSION definition
[PATCH 2/4] staging/spectra: remove unused variable
[PATCH 3/4] staging/spectra: initializa lblk variable
[PATCH 4/4] staging/spectra: remove unused functions

Best regards,

-----------------------------------------
Javier Martínez Canillas
+595 981 88 66 58



--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html