On 03/12/2018 12:08 PM, Dmitry Torokhov wrote:
> Replace the original license statement with the SPDX identifier.
> Add also one line of description as recommended by the COPYING file.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>

Applied to my working branch for atmel_mxt_ts + chromeos_laptop.c for
v4.17. Thanks!

> ---
> drivers/platform/chrome/chromeos_laptop.c | 27 +++++------------------
> 1 file changed, 5 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
> index d8599736a41a2..54a13c70e1d8f 100644
> --- a/drivers/platform/chrome/chromeos_laptop.c
> +++ b/drivers/platform/chrome/chromeos_laptop.c
> @@ -1,25 +1,8 @@
> -/*
> - * chromeos_laptop.c - Driver to instantiate Chromebook i2c/smbus devices.
> - *
> - * Author : Benson Leung <[email protected]>
> - *
> - * Copyright (C) 2012 Google, Inc.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0+
> +// Driver to instantiate Chromebook i2c/smbus devices.
> +//
> +// Copyright (C) 2012 Google, Inc.
> +// Author: Benson Leung <[email protected]>
>
> #include <linux/dmi.h>
> #include <linux/i2c.h>
>

--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]

Attachments:

signature.asc (849.00 B)
OpenPGP digital signature

2018-03-20 02:07:37

by Benson Leung

[permalink] [raw]

Subject: Re: [PATCH 06/14] platform/chrome: chromeos_laptop - introduce pr_fmt()

On 03/12/2018 12:08 PM, Dmitry Torokhov wrote:
> Define pr_fmt() to standardize driver messages.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>

Applied to my working branch for atmel_mxt_ts + chromeos_laptop.c for
v4.17. Thanks!

> ---
> drivers/platform/chrome/chromeos_laptop.c | 31 ++++++++++-------------
> 1 file changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
> index 0a43f1833de3f..08ce7a105e768 100644
> --- a/drivers/platform/chrome/chromeos_laptop.c
> +++ b/drivers/platform/chrome/chromeos_laptop.c
> @@ -4,6 +4,8 @@
> // Copyright (C) 2012 Google, Inc.
> // Author: Benson Leung <[email protected]>
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/dmi.h>
> #include <linux/i2c.h>
> #include <linux/platform_data/atmel_mxt_ts.h>
> @@ -139,15 +141,12 @@ static struct i2c_client *__add_probed_i2c_device(
> if (name) {
> dmi_dev = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD, name, NULL);
> if (!dmi_dev) {
> - pr_err("%s failed to dmi find device %s.\n",
> - __func__,
> - name);
> + pr_err("failed to dmi find device %s\n", name);
> return NULL;
> }
> dev_data = (struct dmi_dev_onboard *)dmi_dev->device_data;
> if (!dev_data) {
> - pr_err("%s failed to get data from dmi for %s.\n",
> - __func__, name);
> + pr_err("failed to get data from dmi for %s\n", name);
> return NULL;
> }
> info->irq = dev_data->instance;
> @@ -155,7 +154,7 @@ static struct i2c_client *__add_probed_i2c_device(
>
> adapter = i2c_get_adapter(bus);
> if (!adapter) {
> - pr_err("%s failed to get i2c adapter %d.\n", __func__, bus);
> + pr_err("failed to get i2c adapter %d\n", bus);
> return NULL;
> }
>
> @@ -174,19 +173,18 @@ static struct i2c_client *__add_probed_i2c_device(
> dummy = i2c_new_probed_device(adapter, &dummy_info,
> alt_addr_list, NULL);
> if (dummy) {
> - pr_debug("%s %d-%02x is probed at %02x\n",
> - __func__, bus, info->addr, dummy->addr);
> + pr_debug("%d-%02x is probed at %02x\n",
> + bus, info->addr, dummy->addr);
> i2c_unregister_device(dummy);
> client = i2c_new_device(adapter, info);
> }
> }
>
> if (!client)
> - pr_notice("%s failed to register device %d-%02x\n",
> - __func__, bus, info->addr);
> + pr_notice("failed to register device %d-%02x\n",
> + bus, info->addr);
> else
> - pr_debug("%s added i2c device %d-%02x\n",
> - __func__, bus, info->addr);
> + pr_debug("added i2c device %d-%02x\n", bus, info->addr);
>
> i2c_put_adapter(adapter);
> return client;
> @@ -227,7 +225,7 @@ static int find_i2c_adapter_num(enum i2c_adapter_type type)
> dev = bus_find_device(&i2c_bus_type, NULL, &lookup, __find_i2c_adap);
> if (!dev) {
> /* Adapters may appear later. Deferred probing will retry */
> - pr_notice("%s: i2c adapter %s not found on system.\n", __func__,
> + pr_notice("i2c adapter %s not found on system.\n",
> lookup.name);
> return -ENODEV;
> }
> @@ -349,7 +347,7 @@ static int setup_tsl2563_als(enum i2c_adapter_type type)
> static int __init chromeos_laptop_dmi_matched(const struct dmi_system_id *id)
> {
> cros_laptop = (void *)id->driver_data;
> - pr_debug("DMI Matched %s.\n", id->ident);
> + pr_debug("DMI Matched %s\n", id->ident);
>
> /* Indicate to dmi_scan that processing is done. */
> return 1;
> @@ -392,8 +390,7 @@ static int chromeos_laptop_probe(struct platform_device *pdev)
> ret = -EPROBE_DEFER;
> } else {
> /* Ran out of tries. */
> - pr_notice("%s: Ran out of tries for device.\n",
> - __func__);
> + pr_notice("ran out of tries for device.\n");
> i2c_dev->state = TIMEDOUT;
> }
> } else {
> @@ -600,7 +597,7 @@ static int __init chromeos_laptop_init(void)
> int ret;
>
> if (!dmi_check_system(chromeos_laptop_dmi_table)) {
> - pr_debug("%s unsupported system.\n", __func__);
> + pr_debug("unsupported system\n");
> return -ENODEV;
> }
>
>

--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]

Attachments:

signature.asc (849.00 B)
OpenPGP digital signature

2018-03-20 02:16:27

by Benson Leung

[permalink] [raw]

Subject: Re: [PATCH 07/14] platform/chrome: chromeos_laptop - factor out getting IRQ from DMI

On 03/12/2018 12:09 PM, Dmitry Torokhov wrote:
> This will make code instantiating I2C device a bit clearer.
>
> Signed-off-by: Dmitry Torokhov <[email protected]>

Applied to my working branch for atmel_mxt_ts + chromeos_laptop.c for
v4.17. Thanks!

> ---
> drivers/platform/chrome/chromeos_laptop.c | 35 +++++++++++++++--------
> 1 file changed, 23 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
> index 08ce7a105e768..96e962ff38e87 100644
> --- a/drivers/platform/chrome/chromeos_laptop.c
> +++ b/drivers/platform/chrome/chromeos_laptop.c
> @@ -120,36 +120,47 @@ static struct i2c_board_info atmel_1664s_device = {
> .flags = I2C_CLIENT_WAKE,
> };
>
> +static int chromeos_laptop_get_irq_from_dmi(const char *dmi_name)
> +{
> + const struct dmi_device *dmi_dev;
> + const struct dmi_dev_onboard *dev_data;
> +
> + dmi_dev = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD, dmi_name, NULL);
> + if (!dmi_dev) {
> + pr_err("failed to find DMI device '%s'\n", dmi_name);
> + return -ENOENT;
> + }
> +
> + dev_data = dmi_dev->device_data;
> + if (!dev_data) {
> + pr_err("failed to get data from DMI for '%s'\n", dmi_name);
> + return -EINVAL;
> + }
> +
> + return dev_data->instance;
> +}
> +
> static struct i2c_client *__add_probed_i2c_device(
> const char *name,
> int bus,
> struct i2c_board_info *info,
> const unsigned short *alt_addr_list)
> {
> - const struct dmi_device *dmi_dev;
> - const struct dmi_dev_onboard *dev_data;
> struct i2c_adapter *adapter;
> struct i2c_client *client = NULL;
> const unsigned short addr_list[] = { info->addr, I2C_CLIENT_END };
>
> if (bus < 0)
> return NULL;
> +
> /*
> * If a name is specified, look for irq platform information stashed
> * in DMI_DEV_TYPE_DEV_ONBOARD by the Chrome OS custom system firmware.
> */
> if (name) {
> - dmi_dev = dmi_find_device(DMI_DEV_TYPE_DEV_ONBOARD, name, NULL);
> - if (!dmi_dev) {
> - pr_err("failed to dmi find device %s\n", name);
> - return NULL;
> - }
> - dev_data = (struct dmi_dev_onboard *)dmi_dev->device_data;
> - if (!dev_data) {
> - pr_err("failed to get data from dmi for %s\n", name);
> + info->irq = chromeos_laptop_get_irq_from_dmi(name);
> + if (info->irq < 0)
> return NULL;
> - }
> - info->irq = dev_data->instance;
> }
>
> adapter = i2c_get_adapter(bus);
>

--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]

Attachments:

signature.asc (849.00 B)
OpenPGP digital signature