diff for duplicates of <20190722134423.26555-8-brgl@bgdev.pl> diff --git a/a/1.txt b/N1/1.txt index 40dd327..a845b18 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,13 +15,14 @@ index 19ed9889c8f8..f2f66605e8fb 100644 +++ b/drivers/video/fbdev/da8xx-fb.c @@ -1339,7 +1339,6 @@ static int fb_probe(struct platform_device *device) { - struct da8xx_lcdc_platform_data *fb_pdata dev_get_platdata(&device->dev); + struct da8xx_lcdc_platform_data *fb_pdata = + dev_get_platdata(&device->dev); - struct resource *lcdc_regs; struct lcd_ctrl_config *lcd_cfg; struct fb_videomode *lcdc_info; struct fb_info *da8xx_fb_info; @@ -1357,8 +1356,7 @@ static int fb_probe(struct platform_device *device) - if (lcdc_info = NULL) + if (lcdc_info == NULL) return -ENODEV; - lcdc_regs = platform_get_resource(device, IORESOURCE_MEM, 0); @@ -32,3 +33,9 @@ index 19ed9889c8f8..f2f66605e8fb 100644 -- 2.21.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index f8ec06a..67774c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190722134423.26555-1-brgl@bgdev.pl\0" "From\0Bartosz Golaszewski <brgl@bgdev.pl>\0" "Subject\0[PATCH v2 7/9] fbdev: da8xx-fb: use devm_platform_ioremap_resource()\0" - "Date\0Mon, 22 Jul 2019 13:44:21 +0000\0" + "Date\0Mon, 22 Jul 2019 15:44:21 +0200\0" "To\0Sekhar Nori <nsekhar@ti.com>" Kevin Hilman <khilman@kernel.org> Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> @@ -30,13 +30,14 @@ "+++ b/drivers/video/fbdev/da8xx-fb.c\n" "@@ -1339,7 +1339,6 @@ static int fb_probe(struct platform_device *device)\n" " {\n" - " \tstruct da8xx_lcdc_platform_data *fb_pdata \t\t\t\t\t\tdev_get_platdata(&device->dev);\n" + " \tstruct da8xx_lcdc_platform_data *fb_pdata =\n" + " \t\t\t\t\t\tdev_get_platdata(&device->dev);\n" "-\tstruct resource *lcdc_regs;\n" " \tstruct lcd_ctrl_config *lcd_cfg;\n" " \tstruct fb_videomode *lcdc_info;\n" " \tstruct fb_info *da8xx_fb_info;\n" "@@ -1357,8 +1356,7 @@ static int fb_probe(struct platform_device *device)\n" - " \tif (lcdc_info = NULL)\n" + " \tif (lcdc_info == NULL)\n" " \t\treturn -ENODEV;\n" " \n" "-\tlcdc_regs = platform_get_resource(device, IORESOURCE_MEM, 0);\n" @@ -46,6 +47,12 @@ " \t\treturn PTR_ERR(da8xx_fb_reg_base);\n" " \n" "-- \n" - 2.21.0 + "2.21.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -21921258215a1217d52f8afcb8f68ca16ea8f1f453dbbc78fe59dd93c9dec2ae +3a01509074cede4878bc039bd8b095183e709490fb078c1a69ffb5cd0ea70d7f
diff --git a/a/1.txt b/N2/1.txt index 40dd327..8420859 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,13 +15,14 @@ index 19ed9889c8f8..f2f66605e8fb 100644 +++ b/drivers/video/fbdev/da8xx-fb.c @@ -1339,7 +1339,6 @@ static int fb_probe(struct platform_device *device) { - struct da8xx_lcdc_platform_data *fb_pdata dev_get_platdata(&device->dev); + struct da8xx_lcdc_platform_data *fb_pdata = + dev_get_platdata(&device->dev); - struct resource *lcdc_regs; struct lcd_ctrl_config *lcd_cfg; struct fb_videomode *lcdc_info; struct fb_info *da8xx_fb_info; @@ -1357,8 +1356,7 @@ static int fb_probe(struct platform_device *device) - if (lcdc_info = NULL) + if (lcdc_info == NULL) return -ENODEV; - lcdc_regs = platform_get_resource(device, IORESOURCE_MEM, 0); diff --git a/a/content_digest b/N2/content_digest index f8ec06a..7e7cd43 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190722134423.26555-1-brgl@bgdev.pl\0" "From\0Bartosz Golaszewski <brgl@bgdev.pl>\0" "Subject\0[PATCH v2 7/9] fbdev: da8xx-fb: use devm_platform_ioremap_resource()\0" - "Date\0Mon, 22 Jul 2019 13:44:21 +0000\0" + "Date\0Mon, 22 Jul 2019 15:44:21 +0200\0" "To\0Sekhar Nori <nsekhar@ti.com>" Kevin Hilman <khilman@kernel.org> Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> David Lechner <david@lechnology.com> " Linus Walleij <linus.walleij@linaro.org>\0" - "Cc\0Bartosz Golaszewski <bgolaszewski@baylibre.com>" - linux-fbdev@vger.kernel.org + "Cc\0linux-arm-kernel@lists.infradead.org" linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + linux-fbdev@vger.kernel.org + " Bartosz Golaszewski <bgolaszewski@baylibre.com>\0" "\00:1\0" "b\0" "From: Bartosz Golaszewski <bgolaszewski@baylibre.com>\n" @@ -30,13 +30,14 @@ "+++ b/drivers/video/fbdev/da8xx-fb.c\n" "@@ -1339,7 +1339,6 @@ static int fb_probe(struct platform_device *device)\n" " {\n" - " \tstruct da8xx_lcdc_platform_data *fb_pdata \t\t\t\t\t\tdev_get_platdata(&device->dev);\n" + " \tstruct da8xx_lcdc_platform_data *fb_pdata =\n" + " \t\t\t\t\t\tdev_get_platdata(&device->dev);\n" "-\tstruct resource *lcdc_regs;\n" " \tstruct lcd_ctrl_config *lcd_cfg;\n" " \tstruct fb_videomode *lcdc_info;\n" " \tstruct fb_info *da8xx_fb_info;\n" "@@ -1357,8 +1356,7 @@ static int fb_probe(struct platform_device *device)\n" - " \tif (lcdc_info = NULL)\n" + " \tif (lcdc_info == NULL)\n" " \t\treturn -ENODEV;\n" " \n" "-\tlcdc_regs = platform_get_resource(device, IORESOURCE_MEM, 0);\n" @@ -48,4 +49,4 @@ "-- \n" 2.21.0 -21921258215a1217d52f8afcb8f68ca16ea8f1f453dbbc78fe59dd93c9dec2ae +0204d917efd071c82f65c6faf5f4e1b871f091c4e842774a60e868db5c90d42a
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.