| Message ID | 1430494721-30793-2-git-send-email-k.kozlowski.k@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 02 May 2015, Krzysztof Kozlowski wrote: > The platform_device_id is not modified by the driver and core uses it as > const. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > --- > drivers/video/fbdev/imxfb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c > index 84d1d29e532c..cee88603efc9 100644 > --- a/drivers/video/fbdev/imxfb.c > +++ b/drivers/video/fbdev/imxfb.c > @@ -170,7 +170,7 @@ struct imxfb_info { > struct regulator *lcd_pwr; > }; > > -static struct platform_device_id imxfb_devtype[] = { > +static const struct platform_device_id imxfb_devtype[] = { > { > .name = "imx1-fb", > .driver_data = IMX1_FB,
Hi Lee, On 05/05/15 11:28, Lee Jones wrote: > On Sat, 02 May 2015, Krzysztof Kozlowski wrote: > >> The platform_device_id is not modified by the driver and core uses it as >> const. >> >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> >> --- >> drivers/video/fbdev/imxfb.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Applied, thanks. You applied the fbdev changes in this series also, not only the backlight changes? Tomi
On Wed, 03 Jun 2015, Tomi Valkeinen wrote: > Hi Lee, > > On 05/05/15 11:28, Lee Jones wrote: > > On Sat, 02 May 2015, Krzysztof Kozlowski wrote: > > > >> The platform_device_id is not modified by the driver and core uses it as > >> const. > >> > >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > >> --- > >> drivers/video/fbdev/imxfb.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Applied, thanks. > > You applied the fbdev changes in this series also, not only the > backlight changes? Ah, yes I did. I assumed they were all due for Backlight. Would you like me to un-apply the non-Backlight patches?
On 03/06/15 14:50, Lee Jones wrote: > On Wed, 03 Jun 2015, Tomi Valkeinen wrote: > >> Hi Lee, >> >> On 05/05/15 11:28, Lee Jones wrote: >>> On Sat, 02 May 2015, Krzysztof Kozlowski wrote: >>> >>>> The platform_device_id is not modified by the driver and core uses it as >>>> const. >>>> >>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> >>>> --- >>>> drivers/video/fbdev/imxfb.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> Applied, thanks. >> >> You applied the fbdev changes in this series also, not only the >> backlight changes? > > Ah, yes I did. I assumed they were all due for Backlight. > > Would you like me to un-apply the non-Backlight patches? If you can easily remove them, yes. But chances for conflict are quite minimal, so if you already have a pile of commits on top of these, it's fine if they go via backlight tree. Tomi
On Wed, 03 Jun 2015, Tomi Valkeinen wrote: > On 03/06/15 14:50, Lee Jones wrote: > > On Wed, 03 Jun 2015, Tomi Valkeinen wrote: > > > >> Hi Lee, > >> > >> On 05/05/15 11:28, Lee Jones wrote: > >>> On Sat, 02 May 2015, Krzysztof Kozlowski wrote: > >>> > >>>> The platform_device_id is not modified by the driver and core uses it as > >>>> const. > >>>> > >>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > >>>> --- > >>>> drivers/video/fbdev/imxfb.c | 2 +- > >>>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> Applied, thanks. > >> > >> You applied the fbdev changes in this series also, not only the > >> backlight changes? > > > > Ah, yes I did. I assumed they were all due for Backlight. > > > > Would you like me to un-apply the non-Backlight patches? > > If you can easily remove them, yes. > > But chances for conflict are quite minimal, so if you already have a > pile of commits on top of these, it's fine if they go via backlight tree. I can easily remove them, no problem. Consider them unapplied.
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 84d1d29e532c..cee88603efc9 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -170,7 +170,7 @@ struct imxfb_info { struct regulator *lcd_pwr; }; -static struct platform_device_id imxfb_devtype[] = { +static const struct platform_device_id imxfb_devtype[] = { { .name = "imx1-fb", .driver_data = IMX1_FB,
The platform_device_id is not modified by the driver and core uses it as const. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> --- drivers/video/fbdev/imxfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)