diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-07-22 21:07:09 -0400 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2014-07-22 21:07:09 -0400 |
commit | 0a16ee633a83374a2bedbd6a057ab7d7e50a1d50 (patch) | |
tree | a04747d2222543978e9fc0e4af5187976d9f713b | |
parent | 6b18aa180645706155da991847bb36b10c1c84c8 (diff) |
extcon: Remove unnecessary OOM messages
The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message. The following
checkpatch warning is also removed.
WARNING: Possible unnecessary 'out of memory' message
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
[Acked by Charles Keepax for arizona part]
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
-rw-r--r-- | drivers/extcon/extcon-arizona.c | 4 | ||||
-rw-r--r-- | drivers/extcon/extcon-max14577.c | 5 | ||||
-rw-r--r-- | drivers/extcon/extcon-max77693.c | 5 | ||||
-rw-r--r-- | drivers/extcon/extcon-max8997.c | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 0b1ee9f55378..59aa51309467 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c | |||
@@ -1117,10 +1117,8 @@ static int arizona_extcon_probe(struct platform_device *pdev) | |||
1117 | return -EPROBE_DEFER; | 1117 | return -EPROBE_DEFER; |
1118 | 1118 | ||
1119 | info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); | 1119 | info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); |
1120 | if (!info) { | 1120 | if (!info) |
1121 | dev_err(&pdev->dev, "Failed to allocate memory\n"); | ||
1122 | return -ENOMEM; | 1121 | return -ENOMEM; |
1123 | } | ||
1124 | 1122 | ||
1125 | info->micvdd = devm_regulator_get(arizona->dev, "MICVDD"); | 1123 | info->micvdd = devm_regulator_get(arizona->dev, "MICVDD"); |
1126 | if (IS_ERR(info->micvdd)) { | 1124 | if (IS_ERR(info->micvdd)) { |
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c index d49e891b5675..7309743d0da1 100644 --- a/drivers/extcon/extcon-max14577.c +++ b/drivers/extcon/extcon-max14577.c | |||
@@ -692,10 +692,9 @@ static int max14577_muic_probe(struct platform_device *pdev) | |||
692 | u8 id; | 692 | u8 id; |
693 | 693 | ||
694 | info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); | 694 | info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); |
695 | if (!info) { | 695 | if (!info) |
696 | dev_err(&pdev->dev, "failed to allocate memory\n"); | ||
697 | return -ENOMEM; | 696 | return -ENOMEM; |
698 | } | 697 | |
699 | info->dev = &pdev->dev; | 698 | info->dev = &pdev->dev; |
700 | info->max14577 = max14577; | 699 | info->max14577 = max14577; |
701 | 700 | ||
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 042bf742c207..77460f2c1ca1 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c | |||
@@ -1099,10 +1099,9 @@ static int max77693_muic_probe(struct platform_device *pdev) | |||
1099 | 1099 | ||
1100 | info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info), | 1100 | info = devm_kzalloc(&pdev->dev, sizeof(struct max77693_muic_info), |
1101 | GFP_KERNEL); | 1101 | GFP_KERNEL); |
1102 | if (!info) { | 1102 | if (!info) |
1103 | dev_err(&pdev->dev, "failed to allocate memory\n"); | ||
1104 | return -ENOMEM; | 1103 | return -ENOMEM; |
1105 | } | 1104 | |
1106 | info->dev = &pdev->dev; | 1105 | info->dev = &pdev->dev; |
1107 | info->max77693 = max77693; | 1106 | info->max77693 = max77693; |
1108 | if (info->max77693->regmap_muic) { | 1107 | if (info->max77693->regmap_muic) { |
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index d22c379766dd..75e501c98005 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c | |||
@@ -661,10 +661,8 @@ static int max8997_muic_probe(struct platform_device *pdev) | |||
661 | 661 | ||
662 | info = devm_kzalloc(&pdev->dev, sizeof(struct max8997_muic_info), | 662 | info = devm_kzalloc(&pdev->dev, sizeof(struct max8997_muic_info), |
663 | GFP_KERNEL); | 663 | GFP_KERNEL); |
664 | if (!info) { | 664 | if (!info) |
665 | dev_err(&pdev->dev, "failed to allocate memory\n"); | ||
666 | return -ENOMEM; | 665 | return -ENOMEM; |
667 | } | ||
668 | 666 | ||
669 | info->dev = &pdev->dev; | 667 | info->dev = &pdev->dev; |
670 | info->muic = max8997->muic; | 668 | info->muic = max8997->muic; |