[PATCH 1/2] [1/2]extcon: standard cable names definition and declaration changed

[PATCH 1/2] [1/2]extcon: standard cable names definition and declaration changed

[anish kumar]

From: anish kumar <anish198519851985@gmail.com>

With this change now individual drivers can use standard cable
names as below:
static const char *arizona_cable[] = {
    extcon_cable_name[EXTCON_USB],
    extcon_cable_name[EXTCON_USB_HOST],
    "CUSTOM_CABLE"
    NULL,
}

Signed-off-by: anish kumar <anish198519851985@gmail.com>
---
 drivers/extcon/extcon-class.c |    4 +---
 include/linux/extcon.h        |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 481cfa0..e09a6c3 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -41,7 +41,7 @@
  * every single port-type of the following cable names. Please choose cable
  * names that are actually used in your extcon device.
  */
-const char *extcon_cable_name[] = {
+const char extcon_cable_name[][CABLE_NAME_MAX + 1] = {
 	[EXTCON_USB]		= "USB",
 	[EXTCON_USB_HOST]	= "USB-Host",
 	[EXTCON_TA]		= "TA",
@@ -62,8 +62,6 @@ const char *extcon_cable_name[] = {
 	[EXTCON_VIDEO_IN]	= "Video-in",
 	[EXTCON_VIDEO_OUT]	= "Video-out",
 	[EXTCON_MECHANICAL]	= "Mechanical",
-
-	NULL,
 };
 
 static struct class *extcon_class;
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index cdd4014..96b5450 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -68,7 +68,7 @@ enum extcon_cable_name {
 	EXTCON_VIDEO_OUT,
 	EXTCON_MECHANICAL,
 };
-extern const char *extcon_cable_name[];
+extern const char extcon_cable_name[][CABLE_NAME_MAX + 1];
 
 struct extcon_cable;
 
-- 
1.7.1

[PATCH 2/2] [2/2] extcon: optimising the check_mutually_exclusive function

[anish kumar]

From: anish kumar <anish198519851985@gmail.com>

Rather than re-inventing the wheel we can use the hamming function
to calculate the number of bits set to check for violation of
exclusivity.

Signed-off-by: anish kumar <anish198519851985@gmail.com>
---
 drivers/extcon/extcon-class.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index e09a6c3..06df95a 100644
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -89,17 +89,13 @@ static int check_mutually_exclusive(struct extcon_dev *edev, u32 new_state)
 		return 0;
 
 	for (i = 0; edev->mutually_exclusive[i]; i++) {
-		int count = 0, j;
+		int weight;
 		u32 correspondants = new_state & edev->mutually_exclusive[i];
-		u32 exp = 1;
-
-		for (j = 0; j < 32; j++) {
-			if (exp & correspondants)
-				count++;
-			if (count > 1)
-				return i + 1;
-			exp <<= 1;
-		}
+
+		/* calculate the total number of bits set */
+		weight = hweight32(correspondants);
+		if (weight > 1)
+			return i + 1;
 	}
 
 	return 0;
-- 
1.7.1

Re: [PATCH 1/2] [1/2]extcon: standard cable names definition and declaration changed

[MyungJoo Ham]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 1948 bytes --]

> From: anish kumar <anish198519851985@gmail.com>
> 
> With this change now individual drivers can use standard cable
> names as below:
> static const char *arizona_cable[] = {
>     extcon_cable_name[EXTCON_USB],
>     extcon_cable_name[EXTCON_USB_HOST],
>     "CUSTOM_CABLE"
>     NULL,
> }
> 
> Signed-off-by: anish kumar <anish198519851985@gmail.com>

Looks good.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>


> ---
>  drivers/extcon/extcon-class.c |    4 +---
>  include/linux/extcon.h        |    2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
> index 481cfa0..e09a6c3 100644
> --- a/drivers/extcon/extcon-class.c
> +++ b/drivers/extcon/extcon-class.c
> @@ -41,7 +41,7 @@
>   * every single port-type of the following cable names. Please choose cable
>   * names that are actually used in your extcon device.
>   */
> -const char *extcon_cable_name[] = {
> +const char extcon_cable_name[][CABLE_NAME_MAX + 1] = {
>  	[EXTCON_USB]		= "USB",
>  	[EXTCON_USB_HOST]	= "USB-Host",
>  	[EXTCON_TA]		= "TA",
> @@ -62,8 +62,6 @@ const char *extcon_cable_name[] = {
>  	[EXTCON_VIDEO_IN]	= "Video-in",
>  	[EXTCON_VIDEO_OUT]	= "Video-out",
>  	[EXTCON_MECHANICAL]	= "Mechanical",
> -
> -	NULL,
>  };
>  
>  static struct class *extcon_class;
> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
> index cdd4014..96b5450 100644
> --- a/include/linux/extcon.h
> +++ b/include/linux/extcon.h
> @@ -68,7 +68,7 @@ enum extcon_cable_name {
>  	EXTCON_VIDEO_OUT,
>  	EXTCON_MECHANICAL,
>  };
> -extern const char *extcon_cable_name[];
> +extern const char extcon_cable_name[][CABLE_NAME_MAX + 1];
>  
>  struct extcon_cable;
>  
> -- 
> 1.7.1
> 
> 
> 
> 
>        
>   
>          
> A
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥