On 11/26/2017 12:55 PM, SF Markus Elfring wrote:
From: Markus Elfring elfring@users.sourceforge.net Date: Sun, 26 Nov 2017 19:46:09 +0100
Omit an extra message for a memory allocation failure in these functions.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring elfring@users.sourceforge.net
nak, unlike many others, these message give extra info on which allocation failed, that can be useful.
drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4 +--- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 4 +--- drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c index 7a75dfda9845..10164a3bae4a 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c @@ -3982,10 +3982,8 @@ static int dispc_init_features(struct platform_device *pdev) struct dispc_features *dst;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
- if (!dst) {
dev_err(&pdev->dev, "Failed to allocate DISPC Features\n");
- if (!dst) return -ENOMEM;
}
switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP24xx:
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index 48c6500c24e1..a5de13777e2b 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -893,10 +893,8 @@ static int dss_init_features(struct platform_device *pdev) struct dss_features *dst;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
- if (!dst) {
dev_err(&pdev->dev, "Failed to allocate local DSS Features\n");
- if (!dst) return -ENOMEM;
}
switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP24xx:
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c index 9a13c35fd6d8..d25eea10c665 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c @@ -195,10 +195,8 @@ static int hdmi_phy_init_features(struct platform_device *pdev) const struct hdmi_phy_features *src;
dst = devm_kzalloc(&pdev->dev, sizeof(*dst), GFP_KERNEL);
- if (!dst) {
dev_err(&pdev->dev, "Failed to allocate HDMI PHY Features\n");
- if (!dst) return -ENOMEM;
}
switch (omapdss_get_version()) { case OMAPDSS_VER_OMAP4430_ES1: