Commit a263a840 authored by Akhil R's avatar Akhil R Committed by Wolfram Sang
Browse files

i2c: smbus: Use device_*() functions instead of of_*() 



Change of_*() functions to device_*() for firmware agnostic usage.
This allows to have the smbus_alert interrupt without any changes
in the controller drivers using the ACPI table.

Signed-off-by: default avatarAkhil R <akhilrajeev@nvidia.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 20e8ef5c

drivers/i2c/i2c-core-base.c

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) 
		goto out_list;

	}



	res = of_i2c_setup_smbus_alert(adap);

	res = i2c_setup_smbus_alert(adap);

	if (res)

		goto out_reg;

drivers/i2c/i2c-core-smbus.c

+6 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/i2c-smbus.h>

#include <linux/property.h>

#include <linux/slab.h>



#include "i2c-core.h"
@@ -701,12 +702,12 @@ struct i2c_client *i2c_new_smbus_alert_device(struct i2c_adapter *adapter, 
}

EXPORT_SYMBOL_GPL(i2c_new_smbus_alert_device);



#if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_OF)

int of_i2c_setup_smbus_alert(struct i2c_adapter *adapter)

#if IS_ENABLED(CONFIG_I2C_SMBUS)

int i2c_setup_smbus_alert(struct i2c_adapter *adapter)

{

	int irq;



	irq = of_property_match_string(adapter->dev.of_node, "interrupt-names",

	irq = device_property_match_string(adapter->dev.parent, "interrupt-names",

					   "smbus_alert");

	if (irq == -EINVAL || irq == -ENODATA)

		return 0;
@@ -715,5 +716,5 @@ int of_i2c_setup_smbus_alert(struct i2c_adapter *adapter) 


	return PTR_ERR_OR_ZERO(i2c_new_smbus_alert_device(adapter, NULL));

}

EXPORT_SYMBOL_GPL(of_i2c_setup_smbus_alert);

EXPORT_SYMBOL_GPL(i2c_setup_smbus_alert);

#endif

drivers/i2c/i2c-smbus.c

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of_irq.h>

#include <linux/property.h>

#include <linux/slab.h>

#include <linux/workqueue.h>
@@ -128,7 +128,8 @@ static int smbalert_probe(struct i2c_client *ara, 
	if (setup) {

		irq = setup->irq;

	} else {

		irq = of_irq_get_byname(adapter->dev.of_node, "smbus_alert");

		irq = fwnode_irq_get_byname(dev_fwnode(adapter->dev.parent),

					    "smbus_alert");

		if (irq <= 0)

			return irq;

	}

include/linux/i2c-smbus.h

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ struct i2c_client *i2c_new_smbus_alert_device(struct i2c_adapter *adapter, 
					      struct i2c_smbus_alert_setup *setup);

int i2c_handle_smbus_alert(struct i2c_client *ara);



#if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_OF)

int of_i2c_setup_smbus_alert(struct i2c_adapter *adap);

#if IS_ENABLED(CONFIG_I2C_SMBUS)

int i2c_setup_smbus_alert(struct i2c_adapter *adap);

#else

static inline int of_i2c_setup_smbus_alert(struct i2c_adapter *adap)

static inline int i2c_setup_smbus_alert(struct i2c_adapter *adap)

{

	return 0;

}