| Message ID | 1392069445-26509-1-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
David, On Mon, Feb 10, 2014 at 7:57 PM, Fabio Estevam <festevam@gmail.com> wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() > instead. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- Any comments about this one? > drivers/gpu/drm/armada/armada_crtc.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c > index d8e3982..2b6e7b7 100644 > --- a/drivers/gpu/drm/armada/armada_crtc.c > +++ b/drivers/gpu/drm/armada/armada_crtc.c > @@ -1037,11 +1037,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num, > if (ret) > return ret; > > - base = devm_request_and_ioremap(dev->dev, res); > - if (!base) { > - DRM_ERROR("failed to ioremap register\n"); > - return -ENOMEM; > - } > + base = devm_ioremap_resource(dev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > > dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); > if (!dcrtc) { > -- > 1.8.1.2 >
On Mon, Feb 24, 2014 at 10:56:31AM -0300, Fabio Estevam wrote: > David, > > On Mon, Feb 10, 2014 at 7:57 PM, Fabio Estevam <festevam@gmail.com> wrote: > > From: Fabio Estevam <fabio.estevam@freescale.com> > > > > devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() > > instead. > > > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > --- > > Any comments about this one? Given the amount of patches I'm presently dealing with, I really don't want to bother with such trivial patches at the moment. What I do want to do is to get stuff like imx-drm and the conversion of armada to the component helpers out the door and queued up for 3.15 as a higher priority than to bother with trivial stuff like this which has the possibility to break those patches. Let's see about dealing with this post 3.14.
On Mon, Feb 24, 2014 at 11:05 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > Given the amount of patches I'm presently dealing with, I really don't > want to bother with such trivial patches at the moment. What I do want > to do is to get stuff like imx-drm and the conversion of armada to the > component helpers out the door and queued up for 3.15 as a higher > priority than to bother with trivial stuff like this which has the > possibility to break those patches. > > Let's see about dealing with this post 3.14. Understood, thanks.
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index d8e3982..2b6e7b7 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1037,11 +1037,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num, if (ret) return ret; - base = devm_request_and_ioremap(dev->dev, res); - if (!base) { - DRM_ERROR("failed to ioremap register\n"); - return -ENOMEM; - } + base = devm_ioremap_resource(dev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); if (!dcrtc) {