reset: Change shared flag from int to bool

RamiroOliveira · pH5 · commit ee48c726d0b0 · 2017-01-20T10:36:14.000+01:00
Since the new parameter being added is going to be a bool this patch
changes the shared flag from int to bool to match the new parameter.

Signed-off-by: Ramiro Oliveira &lt;Ramiro.Oliveira@synopsys.com&gt;
Signed-off-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt;
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
@@ -41,7 +41,7 @@ struct reset_control {
 	struct list_head list;
 	unsigned int id;
 	unsigned int refcnt;
-	int shared;
+	bool shared;
 	atomic_t deassert_count;
 	atomic_t triggered_count;
 };
@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(reset_control_status);
 
 static struct reset_control *__reset_control_get(
 				struct reset_controller_dev *rcdev,
-				unsigned int index, int shared)
+				unsigned int index, bool shared)
 {
 	struct reset_control *rstc;
 
@@ -299,7 +299,7 @@ static void __reset_control_put(struct reset_control *rstc)
 }
 
 struct reset_control *__of_reset_control_get(struct device_node *node,
-				     const char *id, int index, int shared)
+				     const char *id, int index, bool shared)
 {
 	struct reset_control *rstc;
 	struct reset_controller_dev *r, *rcdev;
@@ -379,7 +379,7 @@ static void devm_reset_control_release(struct device *dev, void *res)
 }
 
 struct reset_control *__devm_reset_control_get(struct device *dev,
-				     const char *id, int index, int shared)
+				     const char *id, int index, bool shared)
 {
 	struct reset_control **ptr, *rstc;
 
diff --git a/include/linux/reset.h b/include/linux/reset.h
@@ -13,10 +13,10 @@ int reset_control_deassert(struct reset_control *rstc);
 int reset_control_status(struct reset_control *rstc);
 
 struct reset_control *__of_reset_control_get(struct device_node *node,
-				     const char *id, int index, int shared);
+				     const char *id, int index, bool shared);
 void reset_control_put(struct reset_control *rstc);
 struct reset_control *__devm_reset_control_get(struct device *dev,
-				     const char *id, int index, int shared);
+				     const char *id, int index, bool shared);
 
 int __must_check device_reset(struct device *dev);
 
@@ -69,14 +69,14 @@ static inline int device_reset_optional(struct device *dev)
 
 static inline struct reset_control *__of_reset_control_get(
 					struct device_node *node,
-					const char *id, int index, int shared)
+					const char *id, int index, bool shared)
 {
 	return ERR_PTR(-ENOTSUPP);
 }
 
 static inline struct reset_control *__devm_reset_control_get(
 					struct device *dev,
-					const char *id, int index, int shared)
+					const char *id, int index, bool shared)
 {
 	return ERR_PTR(-ENOTSUPP);
 }
@@ -132,19 +132,19 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id)
 static inline struct reset_control *reset_control_get_shared(
 					struct device *dev, const char *id)
 {
-	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);
+	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true);
 }
 
 static inline struct reset_control *reset_control_get_optional_exclusive(
 					struct device *dev, const char *id)
 {
-	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);
+	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false);
 }
 
 static inline struct reset_control *reset_control_get_optional_shared(
 					struct device *dev, const char *id)
 {
-	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);
+	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true);
 }
 
 /**
@@ -185,7 +185,7 @@ static inline struct reset_control *of_reset_control_get_exclusive(
 static inline struct reset_control *of_reset_control_get_shared(
 				struct device_node *node, const char *id)
 {
-	return __of_reset_control_get(node, id, 0, 1);
+	return __of_reset_control_get(node, id, 0, true);
 }
 
 /**
@@ -202,7 +202,7 @@ static inline struct reset_control *of_reset_control_get_shared(
 static inline struct reset_control *of_reset_control_get_exclusive_by_index(
 					struct device_node *node, int index)
 {
-	return __of_reset_control_get(node, NULL, index, 0);
+	return __of_reset_control_get(node, NULL, index, false);
 }
 
 /**
@@ -230,7 +230,7 @@ static inline struct reset_control *of_reset_control_get_exclusive_by_index(
 static inline struct reset_control *of_reset_control_get_shared_by_index(
 					struct device_node *node, int index)
 {
-	return __of_reset_control_get(node, NULL, index, 1);
+	return __of_reset_control_get(node, NULL, index, true);
 }
 
 /**
@@ -252,7 +252,7 @@ __must_check devm_reset_control_get_exclusive(struct device *dev,
 #ifndef CONFIG_RESET_CONTROLLER
 	WARN_ON(1);
 #endif
-	return __devm_reset_control_get(dev, id, 0, 0);
+	return __devm_reset_control_get(dev, id, 0, false);
 }
 
 /**
@@ -267,19 +267,19 @@ __must_check devm_reset_control_get_exclusive(struct device *dev,
 static inline struct reset_control *devm_reset_control_get_shared(
 					struct device *dev, const char *id)
 {
-	return __devm_reset_control_get(dev, id, 0, 1);
+	return __devm_reset_control_get(dev, id, 0, true);
 }
 
 static inline struct reset_control *devm_reset_control_get_optional_exclusive(
 					struct device *dev, const char *id)
 {
-	return __devm_reset_control_get(dev, id, 0, 0);
+	return __devm_reset_control_get(dev, id, 0, false);
 }
 
 static inline struct reset_control *devm_reset_control_get_optional_shared(
 					struct device *dev, const char *id)
 {
-	return __devm_reset_control_get(dev, id, 0, 1);
+	return __devm_reset_control_get(dev, id, 0, true);
 }
 
 /**
@@ -297,7 +297,7 @@ static inline struct reset_control *devm_reset_control_get_optional_shared(
 static inline struct reset_control *
 devm_reset_control_get_exclusive_by_index(struct device *dev, int index)
 {
-	return __devm_reset_control_get(dev, NULL, index, 0);
+	return __devm_reset_control_get(dev, NULL, index, false);
 }
 
 /**
@@ -313,7 +313,7 @@ devm_reset_control_get_exclusive_by_index(struct device *dev, int index)
 static inline struct reset_control *
 devm_reset_control_get_shared_by_index(struct device *dev, int index)
 {
-	return __devm_reset_control_get(dev, NULL, index, 1);
+	return __devm_reset_control_get(dev, NULL, index, true);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ struct reset_control {`
`41`	`41`	`struct list_head list;`
`42`	`42`	`unsigned int id;`
`43`	`43`	`unsigned int refcnt;`
`44`		`- int shared;`
	`44`	`+ bool shared;`
`45`	`45`	`atomic_t deassert_count;`
`46`	`46`	`atomic_t triggered_count;`
`47`	`47`	`};`
`@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(reset_control_status);`
`254`	`254`
`255`	`255`	`static struct reset_control *__reset_control_get(`
`256`	`256`	`struct reset_controller_dev *rcdev,`
`257`		`- unsigned int index, int shared)`
	`257`	`+ unsigned int index, bool shared)`
`258`	`258`	`{`
`259`	`259`	`struct reset_control *rstc;`
`260`	`260`
`@@ -299,7 +299,7 @@ static void __reset_control_put(struct reset_control *rstc)`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`struct reset_control __of_reset_control_get(struct device_node node,`
`302`		`- const char *id, int index, int shared)`
	`302`	`+ const char *id, int index, bool shared)`
`303`	`303`	`{`
`304`	`304`	`struct reset_control *rstc;`
`305`	`305`	`struct reset_controller_dev r, rcdev;`
`@@ -379,7 +379,7 @@ static void devm_reset_control_release(struct device dev, void res)`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`struct reset_control __devm_reset_control_get(struct device dev,`
`382`		`- const char *id, int index, int shared)`
	`382`	`+ const char *id, int index, bool shared)`
`383`	`383`	`{`
`384`	`384`	`struct reset_control *ptr, rstc;`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ int reset_control_deassert(struct reset_control *rstc);`
`13`	`13`	`int reset_control_status(struct reset_control *rstc);`
`14`	`14`
`15`	`15`	`struct reset_control __of_reset_control_get(struct device_node node,`
`16`		`- const char *id, int index, int shared);`
	`16`	`+ const char *id, int index, bool shared);`
`17`	`17`	`void reset_control_put(struct reset_control *rstc);`
`18`	`18`	`struct reset_control __devm_reset_control_get(struct device dev,`
`19`		`- const char *id, int index, int shared);`
	`19`	`+ const char *id, int index, bool shared);`
`20`	`20`
`21`	`21`	`int __must_check device_reset(struct device *dev);`
`22`	`22`
`@@ -69,14 +69,14 @@ static inline int device_reset_optional(struct device *dev)`
`69`	`69`
`70`	`70`	`static inline struct reset_control *__of_reset_control_get(`
`71`	`71`	`struct device_node *node,`
`72`		`- const char *id, int index, int shared)`
	`72`	`+ const char *id, int index, bool shared)`
`73`	`73`	`{`
`74`	`74`	`return ERR_PTR(-ENOTSUPP);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`static inline struct reset_control *__devm_reset_control_get(`
`78`	`78`	`struct device *dev,`
`79`		`- const char *id, int index, int shared)`
	`79`	`+ const char *id, int index, bool shared)`
`80`	`80`	`{`
`81`	`81`	`return ERR_PTR(-ENOTSUPP);`
`82`	`82`	`}`
`@@ -132,19 +132,19 @@ __must_check reset_control_get_exclusive(struct device dev, const char id)`
`132`	`132`	`static inline struct reset_control *reset_control_get_shared(`
`133`	`133`	`struct device dev, const char id)`
`134`	`134`	`{`
`135`		`- return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);`
	`135`	`+ return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`static inline struct reset_control *reset_control_get_optional_exclusive(`
`139`	`139`	`struct device dev, const char id)`
`140`	`140`	`{`
`141`		`- return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);`
	`141`	`+ return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`static inline struct reset_control *reset_control_get_optional_shared(`
`145`	`145`	`struct device dev, const char id)`
`146`	`146`	`{`
`147`		`- return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);`
	`147`	`+ return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
`@@ -185,7 +185,7 @@ static inline struct reset_control *of_reset_control_get_exclusive(`
`185`	`185`	`static inline struct reset_control *of_reset_control_get_shared(`
`186`	`186`	`struct device_node node, const char id)`
`187`	`187`	`{`
`188`		`- return __of_reset_control_get(node, id, 0, 1);`
	`188`	`+ return __of_reset_control_get(node, id, 0, true);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`
`@@ -202,7 +202,7 @@ static inline struct reset_control *of_reset_control_get_shared(`
`202`	`202`	`static inline struct reset_control *of_reset_control_get_exclusive_by_index(`
`203`	`203`	`struct device_node *node, int index)`
`204`	`204`	`{`
`205`		`- return __of_reset_control_get(node, NULL, index, 0);`
	`205`	`+ return __of_reset_control_get(node, NULL, index, false);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`
`@@ -230,7 +230,7 @@ static inline struct reset_control *of_reset_control_get_exclusive_by_index(`
`230`	`230`	`static inline struct reset_control *of_reset_control_get_shared_by_index(`
`231`	`231`	`struct device_node *node, int index)`
`232`	`232`	`{`
`233`		`- return __of_reset_control_get(node, NULL, index, 1);`
	`233`	`+ return __of_reset_control_get(node, NULL, index, true);`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`/**`
`@@ -252,7 +252,7 @@ __must_check devm_reset_control_get_exclusive(struct device *dev,`
`252`	`252`	`#ifndef CONFIG_RESET_CONTROLLER`
`253`	`253`	`WARN_ON(1);`
`254`	`254`	`#endif`
`255`		`- return __devm_reset_control_get(dev, id, 0, 0);`
	`255`	`+ return __devm_reset_control_get(dev, id, 0, false);`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`/**`
`@@ -267,19 +267,19 @@ __must_check devm_reset_control_get_exclusive(struct device *dev,`
`267`	`267`	`static inline struct reset_control *devm_reset_control_get_shared(`
`268`	`268`	`struct device dev, const char id)`
`269`	`269`	`{`
`270`		`- return __devm_reset_control_get(dev, id, 0, 1);`
	`270`	`+ return __devm_reset_control_get(dev, id, 0, true);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`static inline struct reset_control *devm_reset_control_get_optional_exclusive(`
`274`	`274`	`struct device dev, const char id)`
`275`	`275`	`{`
`276`		`- return __devm_reset_control_get(dev, id, 0, 0);`
	`276`	`+ return __devm_reset_control_get(dev, id, 0, false);`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`static inline struct reset_control *devm_reset_control_get_optional_shared(`
`280`	`280`	`struct device dev, const char id)`
`281`	`281`	`{`
`282`		`- return __devm_reset_control_get(dev, id, 0, 1);`
	`282`	`+ return __devm_reset_control_get(dev, id, 0, true);`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`/**`
`@@ -297,7 +297,7 @@ static inline struct reset_control *devm_reset_control_get_optional_shared(`
`297`	`297`	`static inline struct reset_control *`
`298`	`298`	`devm_reset_control_get_exclusive_by_index(struct device *dev, int index)`
`299`	`299`	`{`
`300`		`- return __devm_reset_control_get(dev, NULL, index, 0);`
	`300`	`+ return __devm_reset_control_get(dev, NULL, index, false);`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`/**`
`@@ -313,7 +313,7 @@ devm_reset_control_get_exclusive_by_index(struct device *dev, int index)`
`313`	`313`	`static inline struct reset_control *`
`314`	`314`	`devm_reset_control_get_shared_by_index(struct device *dev, int index)`
`315`	`315`	`{`
`316`		`- return __devm_reset_control_get(dev, NULL, index, 1);`
	`316`	`+ return __devm_reset_control_get(dev, NULL, index, true);`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`/*`