Commit d84af483 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Rafael J. Wysocki
Browse files

platform/x86: intel_cht_int33fe: Register max17047 in its own function 



To make the probe function a bit more nicer looking, moving
the registration of max17047 to its own function.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3370db35

drivers/platform/x86/intel_cht_int33fe.c

+33 −29
Original line number Diff line number Diff line
@@ -63,14 +63,6 @@ static int cht_int33fe_check_for_max17047(struct device *dev, void *data) 
	return 1;

}



static struct i2c_client *cht_int33fe_find_max17047(void)

{

	struct i2c_client *max17047 = NULL;



	i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047);

	return max17047;

}



static const char * const max17047_suppliers[] = { "bq24190-charger" };



static const struct property_entry max17047_props[] = {
@@ -86,12 +78,40 @@ static const struct property_entry fusb302_props[] = { 
	{ }

};



static int

cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)

{

	struct i2c_client *max17047 = NULL;

	struct i2c_board_info board_info;

	int ret;



	i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047);

	if (max17047) {

		/* Pre-existing i2c-client for the max17047, add device-props */

		ret = device_add_properties(&max17047->dev, max17047_props);

		if (ret)

			return ret;

		/* And re-probe to get the new device-props applied. */

		ret = device_reprobe(&max17047->dev);

		if (ret)

			dev_warn(dev, "Reprobing max17047 error: %d\n", ret);

		return 0;

	}



	memset(&board_info, 0, sizeof(board_info));

	strlcpy(board_info.type, "max17047", I2C_NAME_SIZE);

	board_info.dev_name = "max17047";

	board_info.properties = max17047_props;

	data->max17047 = i2c_acpi_new_device(dev, 1, &board_info);



	return PTR_ERR_OR_ZERO(data->max17047);

}



static int cht_int33fe_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct i2c_board_info board_info;

	struct cht_int33fe_data *data;

	struct i2c_client *max17047;

	struct regulator *regulator;

	unsigned long long ptyp;

	acpi_status status;
@@ -151,26 +171,10 @@ static int cht_int33fe_probe(struct platform_device *pdev) 
	if (!data)

		return -ENOMEM;



	/* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */

	max17047 = cht_int33fe_find_max17047();

	if (max17047) {

		/* Pre-existing i2c-client for the max17047, add device-props */

		ret = device_add_properties(&max17047->dev, max17047_props);

	/* Work around BIOS bug, see comment on cht_int33fe_check_for_max17047 */

	ret = cht_int33fe_register_max17047(dev, data);

	if (ret)

		return ret;

		/* And re-probe to get the new device-props applied. */

		ret = device_reprobe(&max17047->dev);

		if (ret)

			dev_warn(dev, "Reprobing max17047 error: %d\n", ret);

	} else {

		memset(&board_info, 0, sizeof(board_info));

		strlcpy(board_info.type, "max17047", I2C_NAME_SIZE);

		board_info.dev_name = "max17047";

		board_info.properties = max17047_props;

		data->max17047 = i2c_acpi_new_device(dev, 1, &board_info);

		if (IS_ERR(data->max17047))

			return PTR_ERR(data->max17047);

	}



	data->connections[0].endpoint[0] = "port0";

	data->connections[0].endpoint[1] = "i2c-pi3usb30532-switch";

CRA Git | Maintained and supported by SUSTech CRA and CCSE