diff mbox series

[v2] media: ipu3-cio2: Use macros from mm.h

Message ID 20201028155520.14458-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [v2] media: ipu3-cio2: Use macros from mm.h | expand

Commit Message

Andy Shevchenko Oct. 28, 2020, 3:55 p.m. UTC 
There are few nice macros in mm.h, some of which we may use here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
---
v2: rewrote to make it short and neat (Bingbu), added Rb tag (Bingbu)
 drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Andy Shevchenko Nov. 16, 2020, 4:53 p.m. UTC | #1 
On Wed, Oct 28, 2020 at 05:55:20PM +0200, Andy Shevchenko wrote:
> There are few nice macros in mm.h, some of which we may use here.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>

If there is no further comments, can it be applied?

> ---
> v2: rewrote to make it short and neat (Bingbu), added Rb tag (Bingbu)
>  drivers/media/pci/intel/ipu3/ipu3-cio2.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> index d4b575813300..3d0c867e9762 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> @@ -15,6 +15,7 @@
>  #include <linux/delay.h>
>  #include <linux/interrupt.h>
>  #include <linux/iopoll.h>
> +#include <linux/mm.h>
>  #include <linux/module.h>
>  #include <linux/pci.h>
>  #include <linux/pfn.h>
> @@ -190,9 +191,8 @@ static void cio2_fbpt_entry_init_buf(struct cio2_device *cio2,
>  	 * 4095 (PAGE_SIZE - 1) means every single byte in the last page
>  	 * is available for DMA transfer.
>  	 */
> -	entry[1].second_entry.last_page_available_bytes =
> -			(remaining & ~PAGE_MASK) ?
> -				(remaining & ~PAGE_MASK) - 1 : PAGE_SIZE - 1;
> +	remaining = offset_in_page(remaining) ?: PAGE_SIZE;
> +	entry[1].second_entry.last_page_available_bytes = remaining - 1;
>  	/* Fill FBPT */
>  	remaining = length;
>  	i = 0;
> -- 
> 2.28.0
>
Sakari Ailus Nov. 18, 2020, 10:24 p.m. UTC | #2 
On Mon, Nov 16, 2020 at 06:53:19PM +0200, Andy Shevchenko wrote:
> On Wed, Oct 28, 2020 at 05:55:20PM +0200, Andy Shevchenko wrote:
> > There are few nice macros in mm.h, some of which we may use here.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
> 
> If there is no further comments, can it be applied?

It's in my latest pull request, but not in media tree master yet.
diff mbox series

Patch

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index d4b575813300..3d0c867e9762 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -15,6 +15,7 @@ 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/iopoll.h>
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pfn.h>
@@ -190,9 +191,8 @@  static void cio2_fbpt_entry_init_buf(struct cio2_device *cio2,
 	 * 4095 (PAGE_SIZE - 1) means every single byte in the last page
 	 * is available for DMA transfer.
 	 */
-	entry[1].second_entry.last_page_available_bytes =
-			(remaining & ~PAGE_MASK) ?
-				(remaining & ~PAGE_MASK) - 1 : PAGE_SIZE - 1;
+	remaining = offset_in_page(remaining) ?: PAGE_SIZE;
+	entry[1].second_entry.last_page_available_bytes = remaining - 1;
 	/* Fill FBPT */
 	remaining = length;
 	i = 0;