| From bba2d3ffaa63d10e6951f18d38f400474605cfdf Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 27 Aug 2018 18:35:53 +0300 |
| Subject: extcon: cht-wc: Return from default case to avoid warnings |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| [ Upstream commit 962341b54b99965ebec5f70c8d39f1c382eea833 ] |
| |
| When we have first case to fall through it's not enough to put |
| single comment there to satisfy compiler. Instead of doing that, |
| return fall back value directly from default case. |
| |
| This to avoid following warnings: |
| |
| drivers/extcon/extcon-intel-cht-wc.c: In function ‘cht_wc_extcon_get_charger’: |
| include/linux/device.h:1420:2: warning: this statement may fall through [-Wimplicit-fallthrough=] |
| _dev_warn(dev, dev_fmt(fmt), ##__VA_ARGS__) |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| drivers/extcon/extcon-intel-cht-wc.c:148:3: note: in expansion of macro ‘dev_warn’ |
| dev_warn(ext->dev, |
| ^~~~~~~~ |
| drivers/extcon/extcon-intel-cht-wc.c:152:2: note: here |
| case CHT_WC_USBSRC_TYPE_SDP: |
| ^~~~ |
| |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/extcon/extcon-intel-cht-wc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c |
| index 5e1dd27722781..bdb67878179ed 100644 |
| --- a/drivers/extcon/extcon-intel-cht-wc.c |
| +++ b/drivers/extcon/extcon-intel-cht-wc.c |
| @@ -156,7 +156,7 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext, |
| dev_warn(ext->dev, |
| "Unhandled charger type %d, defaulting to SDP\n", |
| ret); |
| - /* Fall through, treat as SDP */ |
| + return EXTCON_CHG_USB_SDP; |
| case CHT_WC_USBSRC_TYPE_SDP: |
| case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN: |
| case CHT_WC_USBSRC_TYPE_OTHER: |
| -- |
| 2.20.1 |
| |