diff for duplicates of <201103112234.10904.marek.vasut@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5f08e52..81f5bb6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,13 +53,13 @@ On Friday 11 March 2011 10:20:47 Vasily Khoruzhick wrote: > lcd_writel(ofb->fbi, OVL2C1, ofb->control[0] & ~OVLxC1_OEN); > > @@ -720,12 +730,10 @@ static int overlayfb_open(struct fb_info *info, int -> user) if (user = 0) +> user) if (user == 0) > return -ENODEV; > > - /* allow only one user at a time */ > - if (atomic_inc_and_test(&ofb->usage)) > - return -EBUSY; -> + if (ofb->usage++ = 0) +> + if (ofb->usage++ == 0) TBH I don't like this notation, it feels hard to read. Can you split that ofb- >usage++ into two parts ? @@ -80,7 +80,7 @@ Cheers > > - atomic_dec(&ofb->usage); > - ofb->ops->disable(ofb); -> + if (ofb->usage = 1) { +> + if (ofb->usage == 1) { > + ofb->ops->disable(ofb); > + ofb->fb.var.height = -1; > + ofb->fb.var.width = -1; @@ -118,7 +118,7 @@ Cheers > } > - > - ofb->video_mem = alloc_pages_exact(size, GFP_KERNEL | __GFP_ZERO); -> - if (ofb->video_mem = NULL) +> - if (ofb->video_mem == NULL) > - return -ENOMEM; > - > - ofb->video_mem_phys = virt_to_phys(ofb->video_mem); @@ -166,7 +166,7 @@ Cheers > + */ > + ofb->video_mem = alloc_pages_exact(PAGE_ALIGN(pxafb->video_mem_size), > + GFP_KERNEL | __GFP_ZERO); -> + if (ofb->video_mem = NULL) +> + if (ofb->video_mem == NULL) > + return -ENOMEM; > + > + ofb->video_mem_phys = virt_to_phys(ofb->video_mem); diff --git a/a/content_digest b/N1/content_digest index 9acaf3c..6a2d43a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0201103060030.59584.anarsoul@gmail.com\0" "ref\01299835250-11095-1-git-send-email-anarsoul@gmail.com\0" - "From\0Marek Vasut <marek.vasut@gmail.com>\0" - "Subject\0Re: [PATCH 1/4] ARM: PXA: PXAFB: rework pxafb overlay memory management\0" - "Date\0Fri, 11 Mar 2011 21:34:10 +0000\0" + "From\0marek.vasut@gmail.com (Marek Vasut)\0" + "Subject\0[PATCH 1/4] ARM: PXA: PXAFB: rework pxafb overlay memory management\0" + "Date\0Fri, 11 Mar 2011 22:34:10 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -61,13 +61,13 @@ "> \tlcd_writel(ofb->fbi, OVL2C1, ofb->control[0] & ~OVLxC1_OEN);\n" "> \n" "> @@ -720,12 +730,10 @@ static int overlayfb_open(struct fb_info *info, int\n" - "> user) if (user = 0)\n" + "> user) if (user == 0)\n" "> \t\treturn -ENODEV;\n" "> \n" "> -\t/* allow only one user at a time */\n" "> -\tif (atomic_inc_and_test(&ofb->usage))\n" "> -\t\treturn -EBUSY;\n" - "> +\tif (ofb->usage++ = 0)\n" + "> +\tif (ofb->usage++ == 0)\n" "\n" "TBH I don't like this notation, it feels hard to read. Can you split that ofb-\n" ">usage++ into two parts ?\n" @@ -88,7 +88,7 @@ "> \n" "> -\tatomic_dec(&ofb->usage);\n" "> -\tofb->ops->disable(ofb);\n" - "> +\tif (ofb->usage = 1) {\n" + "> +\tif (ofb->usage == 1) {\n" "> +\t\tofb->ops->disable(ofb);\n" "> +\t\tofb->fb.var.height\t= -1;\n" "> +\t\tofb->fb.var.width\t= -1;\n" @@ -126,7 +126,7 @@ "> \t}\n" "> -\n" "> -\tofb->video_mem = alloc_pages_exact(size, GFP_KERNEL | __GFP_ZERO);\n" - "> -\tif (ofb->video_mem = NULL)\n" + "> -\tif (ofb->video_mem == NULL)\n" "> -\t\treturn -ENOMEM;\n" "> -\n" "> -\tofb->video_mem_phys = virt_to_phys(ofb->video_mem);\n" @@ -174,7 +174,7 @@ "> +\t */\n" "> +\tofb->video_mem = alloc_pages_exact(PAGE_ALIGN(pxafb->video_mem_size),\n" "> +\t\tGFP_KERNEL | __GFP_ZERO);\n" - "> +\tif (ofb->video_mem = NULL)\n" + "> +\tif (ofb->video_mem == NULL)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" "> +\tofb->video_mem_phys = virt_to_phys(ofb->video_mem);\n" @@ -282,4 +282,4 @@ "> \n" "> \tstruct pxafb_layer_ops\t*ops;" -fc44b4e0f0a38640c70c102dbfe5e85fd881c897885c917a623a2fc6e3557e8b +38ea12036711aded58c7f7b7eff5dea728e3570d89d4c0bc42ea1192002b15f3
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.