mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 16:54:21 +00:00 
			
		
		
		
	mfd: max8997: Simplify getting of_device_id match data
Use of_device_get_match_data() to make the code slightly smaller. There is also no need to wrap it in a check for CONFIG_OF, because dev.of_node will be set only with OF support. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
		
							parent
							
								
									c32d7feba0
								
							
						
					
					
						commit
						b486413dd7
					
				
					 1 changed files with 4 additions and 5 deletions
				
			
		|  | @ -11,6 +11,7 @@ | |||
| #include <linux/slab.h> | ||||
| #include <linux/i2c.h> | ||||
| #include <linux/of.h> | ||||
| #include <linux/of_device.h> | ||||
| #include <linux/of_irq.h> | ||||
| #include <linux/interrupt.h> | ||||
| #include <linux/pm_runtime.h> | ||||
|  | @ -145,11 +146,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata( | |||
| static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c, | ||||
| 						const struct i2c_device_id *id) | ||||
| { | ||||
| 	if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) { | ||||
| 		const struct of_device_id *match; | ||||
| 		match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node); | ||||
| 		return (unsigned long)match->data; | ||||
| 	} | ||||
| 	if (i2c->dev.of_node) | ||||
| 		return (unsigned long)of_device_get_match_data(&i2c->dev); | ||||
| 
 | ||||
| 	return id->driver_data; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Krzysztof Kozlowski
						Krzysztof Kozlowski