From patchwork Wed Dec 7 19:03:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357963wrr; Wed, 7 Dec 2022 11:06:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf4N/NwWWZxeRwyVqDdSRA0jfNwRtwl/diQRt6SNdLpGwp8pC9DNQNIqd0IUcspKni/mjRJh X-Received: by 2002:a63:5d58:0:b0:46f:f383:6faf with SMTP id o24-20020a635d58000000b0046ff3836fafmr82888375pgm.247.1670439967159; Wed, 07 Dec 2022 11:06:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439967; cv=none; d=google.com; s=arc-20160816; b=o71Co0Rtx1Ye0+T39gL83JIk3k0TlNLjdNLAi7+sCfl/nm3M0TedlXd+vTwiH1pOv1 pntbf9RO7/HI+zTywjd3xwAjVkHf2/ukPDVNGH2qKEVrsY5OYBdZFgqKqZd4bOiBPY+b vnetwRsTYP/HyTgJOQ37UvWQOYvfJXkitD0kPNwVcMnEXpx/RpK3qHXwBecuCsuSnYtL w124rAmPqW+EfAllkqImk87nrz+Rreg0kCJMyHN1asB7HhKQjG/7xfy25mR6gm+2gceF 5hpvjK9DHdvQ6rWbZFwMZLdTBXFdiVdNPJFhwNh4GxDXC9JJU7KCwcFN5H2Xc54Fi7wP JmNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=z3Pw9GaqKLFAchmSQAR4mzQwnDwaDPmp4KgNXjEuIxU=; b=dXfjulIH3TqDIchzEG4LKuMdRtbJEErruastQyuLlTMgQ4HEFfFvKQEns8BNhDPWcM 4UTt2w650rPOnuUiKcC8FvjjsW9Os5T6eMmpDHPAx8HAy+WcM2KRgo648Hc+tboDIU9Z wcuIhvft5E/BvxC6HEIRLpAVv8SbN2LW+I9f0VmRSrdRx+8K4WxqL2oAhYu7OkYJViyg jnF+qMsE4WnUdIm3G7vWlKjSLe2rSIfxcoPFgcYNpWXkUq+WkYN2Y/Iz6zk+b5WTLaYD YFfsNc5kCjwM0+BJkktU7PzhY6QkPdWYb4WU/abRLVQv8vQSf+weD2GGiJnnBRrIaIh8 M6XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="h2L/fBbP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e20-20020a63e014000000b0046fd05d55e0si20830912pgh.567.2022.12.07.11.05.31; Wed, 07 Dec 2022 11:06:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="h2L/fBbP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229836AbiLGTEO (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229785AbiLGTEE (ORCPT ); Wed, 7 Dec 2022 14:04:04 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB7476F0EC; Wed, 7 Dec 2022 11:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439842; x=1701975842; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vKGtpM5JSZarHWj35MDsk6li/lREkuRPGsDfjh4bQXA=; b=h2L/fBbPH63mgaslX9b7ICO+UMgzfjc+tC9DQLecLiJYtAYbEnn+2k7n AId9nT2E9QAfKz3E8KJw+ot600kgi0kY55rjQXbXnhOqEV0eIdEI1pXnR 5/a5oVgBAWHeOn3EBjriE2OwIGcrHMuwYsPjioK8TJCXQg3TyQkobe3Mo N3H8uDuPf6FsTH12go4lIxxb+tazvMhSOx1FNfhT0PKEPzZeFwdDrwArl coFmLpH3fa/agjrf7ZUwFVYI9hDKuXuASkECfWOFj9Vm0AX9U50+JWPXt w6lqsI1mH6KLb50inOHOV150swFORtyXkCYsopWNBZzJqS/8r30Kce+Zw Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690223" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690223" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060667" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060667" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D5B94F4; Wed, 7 Dec 2022 21:04:08 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 01/11] iio: light: tsl2563: Do not hardcode interrupt trigger type Date: Wed, 7 Dec 2022 21:03:38 +0200 Message-Id: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583258763237769?= X-GMAIL-MSGID: =?utf-8?q?1751583258763237769?= From: Ferry Toth Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_RAISING, let's respect the settings specified in the firmware description. To be compatible with the older firmware descriptions, if trigger type is not set up there, we'll set it to default (raising edge). Fixes: 388be4883952 ("staging:iio: tsl2563 abi fixes and interrupt handling") Fixes: bdab1001738f ("staging:iio:light:tsl2563 remove old style event registration.") Signed-off-by: Ferry Toth Signed-off-by: Andy Shevchenko --- drivers/iio/light/tsl2563.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index d0e42b73203a..71302ae864d9 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -704,6 +704,7 @@ static int tsl2563_probe(struct i2c_client *client) struct iio_dev *indio_dev; struct tsl2563_chip *chip; struct tsl2563_platform_data *pdata = client->dev.platform_data; + unsigned long irq_flags; int err = 0; u8 id = 0; @@ -759,10 +760,15 @@ static int tsl2563_probe(struct i2c_client *client) indio_dev->info = &tsl2563_info_no_irq; if (client->irq) { + irq_flags = irq_get_trigger_type(client->irq); + if (irq_flags == IRQF_TRIGGER_NONE) + irq_flags = IRQF_TRIGGER_RISING; + irq_flags |= IRQF_ONESHOT; + err = devm_request_threaded_irq(&client->dev, client->irq, NULL, &tsl2563_event_handler, - IRQF_TRIGGER_RISING | IRQF_ONESHOT, + irq_flags, "tsl2563_event", indio_dev); if (err) { From patchwork Wed Dec 7 19:03:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30990 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357740wrr; Wed, 7 Dec 2022 11:05:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf6an5F1QWfSNlNHSDqzjrOJq+xkmIXhMbkteV56FbDknoAxKIoB2Ekty1wkEXsS/0MiiLaf X-Received: by 2002:a62:62c4:0:b0:575:e44e:3e0 with SMTP id w187-20020a6262c4000000b00575e44e03e0mr35517030pfb.53.1670439942103; Wed, 07 Dec 2022 11:05:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439942; cv=none; d=google.com; s=arc-20160816; b=IT7juxiflvFnuPtT3VaLeUvtGgUsMoqYdRLbjMwHwG7UZMp9X7caGOG0GtlzcmyZO6 oh1pMqhTBU3y4da7WaqtsrPOEXEf7NV19748bI5UX/qfcVYEJZxKA1Y5Rue4ml/WB80W M9VqrezlSOxHfNVUlALU/RgSUzvWpBuu+6+5sMOSqXiayWYORmVNcMznS0V4C2LQ4wq5 5amNoDepZrXxT5gjOHDgO+uNsAEFVvTXBxpKCcXg7Dm0XJYpVmEwAEwS+5DvIsZE+0Wq /3TTrgTRGC9L0POH2L/rh9e/QU2KQlzAkYBtPio4czUzPbNuMFDFhDYlwMl5L0pJgXV1 gV+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3hGOV9SjS3lifzqQROYmLHfxV7dChLeydSrRF0pNZoA=; b=JhZ0JY27H34+a+9hlT/e+LuuEsW3CdBtKaTA5xQUuxlaJ0MPN5k8Ce5TrJX5l3mxhN BA4mkXuLcDU22qiid8847m8n5f8/n1I8VsBwddUxizjmEAbbRw/sins6pGvVdt/zlE5l EiujhWDAnQzhpu7D0q8UOvRKv5iV/BFPPjUAsl/7Q/AW2uxxaG4w8N/9iOCPHBzxqZI1 RcwyPni5RBMrHNff3xlzPOGk+4LOP/GnbpGNpy+Gg9nw3twsTL6sf11Y0Z0yx+et+tmw j0kOeAvyso8BCZTG5KDinlHjLJm1oMjfeqPNv4FxsRoOxcpVWeuqVtR05qFDoCMD8D00 zRUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WyNw65EY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a25-20020a637059000000b0047764bac806si8222719pgn.749.2022.12.07.11.05.25; Wed, 07 Dec 2022 11:05:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WyNw65EY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbiLGTEM (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbiLGTEC (ORCPT ); Wed, 7 Dec 2022 14:04:02 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C51216F0E5; Wed, 7 Dec 2022 11:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439841; x=1701975841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/H2fZdJPM8yMp96COjKrh0H4heUd+wkuErAFe2JcCKs=; b=WyNw65EYn29BnSj+k7OGR1qPv3lMSXhhNZRzqsh74F/iKmnr7fqTftaG HcL+iGXknU3Dw36o+3YaFmnYQvgrqF1rqyqvu5HqMNmw/gQpoMSgteKEU 7ZvPvvNHvk4hJ7NrBEFBTFYkEsaI7xodQIY0bdumH67+E/pYA4cT9a2R9 9iUi2JqdXetk1EAsof2YPXnFVLtuaUUWY3DrhibsXgutejwDLop9j3IZr yJPf2nIo1kLW0Jcx1eEes6CypFpguVt35j68nBn8KbeAhqk3WZv7LSUcI LY2uGDpZVGiQ1QEtCuqG4aNFICT2eQx6hPMhLYVzd8Io3VEE07h18sKW2 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690219" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690219" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060666" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060666" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E07C184; Wed, 7 Dec 2022 21:04:08 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 02/11] iio: light: tsl2563: Use i2c_smbus_write_word_data() in tsl2563_configure() Date: Wed, 7 Dec 2022 21:03:39 +0200 Message-Id: <20221207190348.9347-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583232700855971?= X-GMAIL-MSGID: =?utf-8?q?1751583232700855971?= Driver already uses the word accessors when it makes sense, but in the tsl2563_configure(). Switch the latter to use word accessor. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 52 ++++++++++++++----------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index 71302ae864d9..d836c15ba777 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -49,16 +49,12 @@ #define TSL2563_REG_CTRL 0x00 #define TSL2563_REG_TIMING 0x01 -#define TSL2563_REG_LOWLOW 0x02 /* data0 low threshold, 2 bytes */ -#define TSL2563_REG_LOWHIGH 0x03 -#define TSL2563_REG_HIGHLOW 0x04 /* data0 high threshold, 2 bytes */ -#define TSL2563_REG_HIGHHIGH 0x05 +#define TSL2563_REG_LOW 0x02 /* data0 low threshold, 2 bytes */ +#define TSL2563_REG_HIGH 0x04 /* data0 high threshold, 2 bytes */ #define TSL2563_REG_INT 0x06 #define TSL2563_REG_ID 0x0a -#define TSL2563_REG_DATA0LOW 0x0c /* broadband sensor value, 2 bytes */ -#define TSL2563_REG_DATA0HIGH 0x0d -#define TSL2563_REG_DATA1LOW 0x0e /* infrared sensor value, 2 bytes */ -#define TSL2563_REG_DATA1HIGH 0x0f +#define TSL2563_REG_DATA0 0x0c /* broadband sensor value, 2 bytes */ +#define TSL2563_REG_DATA1 0x0e /* infrared sensor value, 2 bytes */ #define TSL2563_CMD_POWER_ON 0x03 #define TSL2563_CMD_POWER_OFF 0x00 @@ -161,24 +157,16 @@ static int tsl2563_configure(struct tsl2563_chip *chip) chip->gainlevel->gaintime); if (ret) goto error_ret; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_HIGHLOW, - chip->high_thres & 0xFF); - if (ret) - goto error_ret; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_HIGHHIGH, - (chip->high_thres >> 8) & 0xFF); + ret = i2c_smbus_write_word_data(chip->client, + TSL2563_CMD | TSL2563_REG_HIGH, + chip->high_thres); if (ret) goto error_ret; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_LOWLOW, - chip->low_thres & 0xFF); + ret = i2c_smbus_write_word_data(chip->client, + TSL2563_CMD | TSL2563_REG_LOW, + chip->low_thres); if (ret) goto error_ret; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_LOWHIGH, - (chip->low_thres >> 8) & 0xFF); /* * Interrupt register is automatically written anyway if it is relevant * so is not here. @@ -325,13 +313,13 @@ static int tsl2563_get_adc(struct tsl2563_chip *chip) while (retry) { ret = i2c_smbus_read_word_data(client, - TSL2563_CMD | TSL2563_REG_DATA0LOW); + TSL2563_CMD | TSL2563_REG_DATA0); if (ret < 0) goto out; adc0 = ret; ret = i2c_smbus_read_word_data(client, - TSL2563_CMD | TSL2563_REG_DATA1LOW); + TSL2563_CMD | TSL2563_REG_DATA1); if (ret < 0) goto out; adc1 = ret; @@ -584,20 +572,18 @@ static int tsl2563_write_thresh(struct iio_dev *indio_dev, { struct tsl2563_chip *chip = iio_priv(indio_dev); int ret; - u8 address; + + mutex_lock(&chip->lock); if (dir == IIO_EV_DIR_RISING) - address = TSL2563_REG_HIGHLOW; + ret = i2c_smbus_write_word_data(chip->client, + TSL2563_CMD | TSL2563_REG_HIGH, val); else - address = TSL2563_REG_LOWLOW; - mutex_lock(&chip->lock); - ret = i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | address, - val & 0xFF); + ret = i2c_smbus_write_word_data(chip->client, + TSL2563_CMD | TSL2563_REG_LOW, val); if (ret) goto error_ret; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | (address + 1), - (val >> 8) & 0xFF); + if (dir == IIO_EV_DIR_RISING) chip->high_thres = val; else From patchwork Wed Dec 7 19:03:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30987 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357272wrr; Wed, 7 Dec 2022 11:04:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf7MZf1pnqwIsjGdhc7Iunl8oYunBmf0gMnQqYw9DeUKkvnSch21CCcIn052oXrB0TdvT1r9 X-Received: by 2002:a17:902:ced1:b0:179:ee31:1527 with SMTP id d17-20020a170902ced100b00179ee311527mr45009212plg.138.1670439885994; Wed, 07 Dec 2022 11:04:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439885; cv=none; d=google.com; s=arc-20160816; b=0T5wKnwl5RFC5YJ1YxPAc8WilJjkyZSqJ5G0/4t1GhXqgVMdPM26yPBbaaUb2hoU5Y NuVUTDW0QbTEdbhEBOXv41DTVddqRDaa8rNg1OS4azBLmVzKlIMVbQglURQ2Pyil2Mzg DvgBgOiwBaylMIM8l0yxu2nz+ngyy4Rk+GK6yhleKZKoiFbWZAeRzBm/FuDgG6/w5bAn wlKM6b2aeCnUXfkpVdLTxhriz4k3tlLcx4uY47jCFq/0xJRVZHWrfElr+6EuAYpbzv2e vciWlXteQciEqssPX1yo1r+BxHYYUWc68wDEHFP9HCKsuWCLvqYE8zKNHOIgMNZeBF0b 5ePQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YEjA4CK9NcxNNblCMnPUR5gtw8BXNS9FHNkkRFV9jN0=; b=kcFfVl9UV1dSYkpRVMK5T2QzfN8AwJSkK2KymvmQxzYWfpL+TYOu9G8zoNcVp+g30q kejXDb6Bioqdm/HS6Frpz9RBBgenCFDv/tVWaZK8Q5kneM7xJ7z2kMqOpYyqKDXc4ikf nVN/IRfQqyh1ieS/yYs8T6AA0AU4A0RU76oKaN/ToFVaUjQwZQlZ/yRKwmnvhJJDia6t wQXVRIdjfrJPW9wYrT0g4uehOpO7VDVU0I0TgvKEAaQQmoGfoUroAfd78aHx2aSDdV3+ U1kuG4gszmOBJoJ/3JO4FIZS1HvtZW7qwTGsz+9Ppn9/tdE2Rck4GScNf73eZbzNDTHX Darw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gWDaSw7F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t9-20020a17090340c900b0018958a858c4si21316168pld.238.2022.12.07.11.04.26; Wed, 07 Dec 2022 11:04:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gWDaSw7F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229763AbiLGTD4 (ORCPT + 99 others); Wed, 7 Dec 2022 14:03:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbiLGTDz (ORCPT ); Wed, 7 Dec 2022 14:03:55 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599726F0EE; Wed, 7 Dec 2022 11:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439834; x=1701975834; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vdEVmZQNO9VO1F38YAk1ZaQw0SFXjy1f+wbWsIodxGs=; b=gWDaSw7FfteV9KHm5sQG6Nlu8UH9Pwbb31tB1xqerWvVPxffsfPHM1vb gz9aoNm3bS7PoCp7EFvzgZl1aWGKAuxKjFuopcqBYFxlNg4RwhzUTg39r fW1FtuIoNTsjcAfH1N88AlB7jHmSareyF7THCohTb1bBtKs+J5dhYZiCK LDP7XRfSjR9kOgapb384wv7FB9XV9XZjCyRpxXyIUwTKBnbNWn5L6TTGu KHjh6i5E16kLlXIOOD47kjMV10SioCqMbytLllcUm+ydSSvfEtG8D0jqo ndjc56iV2dkJ+U3bznCzqc+rLRRI1KzRLmTb/SoAPieCaCIs6lS1K5KJG A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="297333237" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="297333237" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="624411138" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="624411138" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 07 Dec 2022 11:03:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E588F179; Wed, 7 Dec 2022 21:04:08 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 03/11] iio: light: tsl2563: Configure INT in one place Date: Wed, 7 Dec 2022 21:03:40 +0200 Message-Id: <20221207190348.9347-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583174221051885?= X-GMAIL-MSGID: =?utf-8?q?1751583174221051885?= Introduce tsl2563_configure_irq() to configure INT in one place. While at it, make use of TSL2563_INT_LEVEL and newly introduced TSL2563_INT_MASK. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 42 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index d836c15ba777..d071805239ef 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -69,6 +69,7 @@ #define TSL2563_INT_DISABLED 0x00 #define TSL2563_INT_LEVEL 0x10 +#define TSL2563_INT_MASK 0x30 #define TSL2563_INT_PERSIST(n) ((n) & 0x0F) struct tsl2563_gainlevel_coeff { @@ -211,6 +212,24 @@ static int tsl2563_read_id(struct tsl2563_chip *chip, u8 *id) return 0; } +static int tsl2563_configure_irq(struct tsl2563_chip *chip, bool enable) +{ + int ret; + + chip->intr &= ~TSL2563_INT_MASK; + if (enable) + chip->intr |= TSL2563_INT_LEVEL; + + ret = i2c_smbus_write_byte_data(chip->client, + TSL2563_CMD | TSL2563_REG_INT, + chip->intr); + if (ret < 0) + return ret; + + chip->int_enabled = enable; + return 0; +} + /* * "Normalized" ADC value is one obtained with 400ms of integration time and * 16x gain. This function returns the number of bits of shift needed to @@ -620,9 +639,7 @@ static int tsl2563_write_interrupt_config(struct iio_dev *indio_dev, int ret = 0; mutex_lock(&chip->lock); - if (state && !(chip->intr & 0x30)) { - chip->intr &= ~0x30; - chip->intr |= 0x10; + if (state && !(chip->intr & TSL2563_INT_MASK)) { /* ensure the chip is actually on */ cancel_delayed_work_sync(&chip->poweroff_work); if (!tsl2563_get_power(chip)) { @@ -633,18 +650,11 @@ static int tsl2563_write_interrupt_config(struct iio_dev *indio_dev, if (ret) goto out; } - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_INT, - chip->intr); - chip->int_enabled = true; + ret = tsl2563_configure_irq(chip, true); } - if (!state && (chip->intr & 0x30)) { - chip->intr &= ~0x30; - ret = i2c_smbus_write_byte_data(chip->client, - TSL2563_CMD | TSL2563_REG_INT, - chip->intr); - chip->int_enabled = false; + if (!state && (chip->intr & TSL2563_INT_MASK)) { + ret = tsl2563_configure_irq(chip, false); /* now the interrupt is not enabled, we can go to sleep */ schedule_delayed_work(&chip->poweroff_work, 5 * HZ); } @@ -668,7 +678,7 @@ static int tsl2563_read_interrupt_config(struct iio_dev *indio_dev, if (ret < 0) return ret; - return !!(ret & 0x30); + return !!(ret & TSL2563_INT_MASK); } static const struct iio_info tsl2563_info_no_irq = { @@ -796,9 +806,7 @@ static void tsl2563_remove(struct i2c_client *client) if (!chip->int_enabled) cancel_delayed_work_sync(&chip->poweroff_work); /* Ensure that interrupts are disabled - then flush any bottom halves */ - chip->intr &= ~0x30; - i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | TSL2563_REG_INT, - chip->intr); + tsl2563_configure_irq(chip, false); tsl2563_set_power(chip, 0); } From patchwork Wed Dec 7 19:03:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30989 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357559wrr; Wed, 7 Dec 2022 11:05:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf4tZfB9BQdKzB+9Y7jg4Ex4K1HKit8pCNdcGCO2rpOq/2bTOJlmm68IGcpHo6fEGmej3wyL X-Received: by 2002:a17:903:187:b0:189:de92:ab2c with SMTP id z7-20020a170903018700b00189de92ab2cmr12978398plg.113.1670439918942; Wed, 07 Dec 2022 11:05:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439918; cv=none; d=google.com; s=arc-20160816; b=dt91q9CkF4Za/LR+tYtrGBC9HyS2JuvziuPNxNU9CtayIPqxTlj3XX8svnyrdR8rVM 2ASx9jlQ/y+xM49D+BlxsJa6sxo1h/DGZ36p4RDTelfVnU3nKBjPXL5fRFh2pbiX4COc OCY26MhyEo7pFaz2XcX5NT6+bSUGQCixVgKyOulKGS6wYr7l+WdRxTsmITrVAM7f9JIX erhKrZmyU8GkE16ywFOpLRxMxTQZZNRHXjUG7f9NVA84hRKH7RjpAEtiARpwjlOhJosv R+I54mfd1ldq5ICwRR+bFuGIzjJBgi6r9BoPJ9hQcXfoiXBWByTiS3asJm53PC62yNFP a+PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GxBz4elKSgyThxpcsZiQzkkYYXm9a4SPTMlO9a7s49E=; b=UHlw8oIrU8u3pTj8MY1M90T9oRkj/oe44P74rKEiDQs5KeO93uD62yCvjUgtqlB41Z 3Xtho1ty6iKgcvtBFkedOWiE6Xmhr7dt5qFCC6lz/la0nlRfpjI0OzYqdKKa8WOOsA9g l6F4QZ52gBGgztvNwcycyyWGAbuJ6hU08Kt1pjq3brIgQzGQeP/KPEc44cQlWIiDUT+J MArSSJMQhfnkTKow0E6yg+aW9JpM1axXq+N6SL6f76Hds/vqaugPMnOVqzZUCrnhwvpe 4o93ARKz1ePsQh1UhPwk+DgOznhKRAHfPuBt2f9BoKc2ljqGE5ZGrcpa7jAkE/mvePGK 14nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cY36tAb9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x20-20020a17090a531400b002196df802afsi2075559pjh.76.2022.12.07.11.04.59; Wed, 07 Dec 2022 11:05:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cY36tAb9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229807AbiLGTEI (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229761AbiLGTEB (ORCPT ); Wed, 7 Dec 2022 14:04:01 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2990B6F0F8; Wed, 7 Dec 2022 11:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439841; x=1701975841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pMQGPBFtt905fG46sLXpc+j2JDZM7i+fIGP5das7BdQ=; b=cY36tAb9aRYRTxV2LhiHiafheZU07VD31ZuCbD/UMJqEKSmOMq4S1I0x 1vJU6L0bjTtq7Fpd7eo3aTTJxOfLvNH6aKKQMGqSu9HWmOzfZ/LuWEkjM fQaQxsWnLQ3xyFajgH8MZRfnUDYbNdD52v4lC/6wuoOL5zapXKBNFOqoM eBpdRI4H63fGtpKOqhunJOVAiMV5CZRtS4Z0JW1vXuAojjNkqoh1m3BbB XJGSmd2zf4w7fk4fBV7C1FWOceV+vi1Kfuvcc7x9OvW2wgv9c7ape5nQL 1uh/h7q2jTND+hVHOmkgjizI795/Q6DI6kzmNw1kfMHBHFQXj8LkVxBna g==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690216" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690216" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060665" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060665" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 087E33B3; Wed, 7 Dec 2022 21:04:08 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 04/11] iio: light: tsl2563: Make use of the macros from bits.h Date: Wed, 7 Dec 2022 21:03:41 +0200 Message-Id: <20221207190348.9347-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583208342444185?= X-GMAIL-MSGID: =?utf-8?q?1751583208342444185?= Make use of BIT() and GENMASK() where it makes sense. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index d071805239ef..3b60d8000351 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -11,6 +11,7 @@ * Amit Kucheria */ +#include #include #include #include @@ -33,19 +34,19 @@ #define ADC_FRAC_BITS 14 /* Given number of 1/10000's in ADC_FRAC_BITS precision. */ -#define FRAC10K(f) (((f) * (1L << (ADC_FRAC_BITS))) / (10000)) +#define FRAC10K(f) (((f) * BIT(ADC_FRAC_BITS)) / (10000)) /* Bits used for fraction in calibration coefficients.*/ #define CALIB_FRAC_BITS 10 /* 0.5 in CALIB_FRAC_BITS precision */ -#define CALIB_FRAC_HALF (1 << (CALIB_FRAC_BITS - 1)) +#define CALIB_FRAC_HALF BIT(CALIB_FRAC_BITS - 1) /* Make a fraction from a number n that was multiplied with b. */ #define CALIB_FRAC(n, b) (((n) << CALIB_FRAC_BITS) / (b)) /* Decimal 10^(digits in sysfs presentation) */ #define CALIB_BASE_SYSFS 1000 -#define TSL2563_CMD 0x80 -#define TSL2563_CLEARINT 0x40 +#define TSL2563_CMD BIT(7) +#define TSL2563_CLEARINT BIT(6) #define TSL2563_REG_CTRL 0x00 #define TSL2563_REG_TIMING 0x01 @@ -58,19 +59,19 @@ #define TSL2563_CMD_POWER_ON 0x03 #define TSL2563_CMD_POWER_OFF 0x00 -#define TSL2563_CTRL_POWER_MASK 0x03 +#define TSL2563_CTRL_POWER_MASK GENMASK(1, 0) #define TSL2563_TIMING_13MS 0x00 #define TSL2563_TIMING_100MS 0x01 #define TSL2563_TIMING_400MS 0x02 -#define TSL2563_TIMING_MASK 0x03 +#define TSL2563_TIMING_MASK GENMASK(1, 0) #define TSL2563_TIMING_GAIN16 0x10 #define TSL2563_TIMING_GAIN1 0x00 #define TSL2563_INT_DISABLED 0x00 #define TSL2563_INT_LEVEL 0x10 -#define TSL2563_INT_MASK 0x30 -#define TSL2563_INT_PERSIST(n) ((n) & 0x0F) +#define TSL2563_INT_MASK GENMASK(5, 4) +#define TSL2563_INT_PERSIST(n) ((n) & GENMASK(3, 0)) struct tsl2563_gainlevel_coeff { u8 gaintime; From patchwork Wed Dec 7 19:03:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357806wrr; Wed, 7 Dec 2022 11:05:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DY+BOBC2mEHZxwLpFuX85GBwjFp8kGcPlPWFJ6zMkN7juZ+gpLGm5mJq92LWYdzvSGkBo X-Received: by 2002:a17:903:1203:b0:189:30cd:8fa4 with SMTP id l3-20020a170903120300b0018930cd8fa4mr79190879plh.103.1670439949580; Wed, 07 Dec 2022 11:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439949; cv=none; d=google.com; s=arc-20160816; b=LHL8R7NCiDsBikN3MPqG3/icbvvrSVbTt2NCH8QBPdJ1sHXqhtxE5kM+NoQTWhkyvZ NldcMSC6Ubvm+RsPTVv82b6wmcUwY/nEJHVSsdwpf/kyY2lU+SCTilPFmQKe+SMo6zRU fL2SLQOvlJ8jqcr3ag10rXkuX0fR8Ig2k7XDebeNN1hy7+avTtthKwOs4ribxVT2Dszh wnjzNx79jK0mhkrrBU1o/GZf/oIB6af4DShjM8gEo0IKRyVjEijXQWVM+NXv219bVTf4 sp+AlwuKYA+HeTsynUPQijqkBavZMg9wWNTjm6zqI7uBlPg/F6fMKIUjnz9FTTXb8i4h TDJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yQMIkyqxS08Gd+bbaCPDtzE0ybzjTkAOkY3rR5WaEks=; b=PB5AOEkWE6mQ85A/mIUu1r4WN39BD/rGY8BbiUExEtMER32AjFE/SeVOAhyKGsj2tu Hne4pMOEXEEw/k9kOqOvuyzWU8znJcGRYII2bdv69FF+ZewoO6gYVeNw1Te1KYiCUGqU jFTtRzAgZ+22pSHxuRGfMzBoHOOnuOYkDtf9xrNtapxUJqwdkZNm/qE+Jxs0R9/YQz9l 8K1eI0R4DSV6U28VoYeBUMIrep0GmTkvSDppyECWZKtsoASza7AOh0b/Ge35hSUUPSy7 XHmQVd6h+wltCJTJIOtvp+nZoDPMXS9TRQ2t+jTxjy1GWbUSBDTJj+/gE/i8KxwoAQwb hMwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RjrNYgy9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lr18-20020a17090b4b9200b0021336b17122si2366897pjb.5.2022.12.07.11.05.35; Wed, 07 Dec 2022 11:05:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RjrNYgy9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbiLGTET (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229788AbiLGTEE (ORCPT ); Wed, 7 Dec 2022 14:04:04 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE2FC70614; Wed, 7 Dec 2022 11:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439842; x=1701975842; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5GwPuobCpJ0+heyq5ckbm6iaVU06rI+4xJ6yg8SuKhM=; b=RjrNYgy9SLTW0HJweCLS77U6R2DvngqMnAwbyEUdHv4gxzoAoetqOpdG U+h4q787M/pv56x8O2S0J+NUn7w/LjqrS2PQm+0pYspgSYnmJrBU0/IHS Kxkv2PFrcGrr8b7mQFxM2LkiYdaoDlxBrjpjTPzR72nQXyTYtIkwkK6mZ v5VD1EvPYq1OLi5qhRrqqmudgP+RiPGi9yePb7YvD4+qMjneNeRalH6G2 zc9ngan3BdT1ctL4qAs/Bq3COnOwWjJzbEBLG3fTma+5FjnU4o8GQsoMT qtRMACKBD8DWR72wyglY6lqsLpllGnhKEdxXHLdjT9RMaEHiqjrF2xJzb A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690226" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690226" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060668" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060668" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0E46D184; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 05/11] iio: light: tsl2563: Drop unused defintion(s) Date: Wed, 7 Dec 2022 21:03:42 +0200 Message-Id: <20221207190348.9347-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583240450209713?= X-GMAIL-MSGID: =?utf-8?q?1751583240450209713?= The CALIB_FRAC() is defined and might had been used in tsl2563_calib_from_sysfs(). But let's just move a comment from it to the latter function. CLAIB_FRAC_HALF is used in a single place, i.e. in tsl2563_calib_to_sysfs(). So, let's just inline it there. While at it, switch to use DIV_ROUND_CLOSEST(). Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index 3b60d8000351..bdd40a5df53d 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -38,10 +39,6 @@ /* Bits used for fraction in calibration coefficients.*/ #define CALIB_FRAC_BITS 10 -/* 0.5 in CALIB_FRAC_BITS precision */ -#define CALIB_FRAC_HALF BIT(CALIB_FRAC_BITS - 1) -/* Make a fraction from a number n that was multiplied with b. */ -#define CALIB_FRAC(n, b) (((n) << CALIB_FRAC_BITS) / (b)) /* Decimal 10^(digits in sysfs presentation) */ #define CALIB_BASE_SYSFS 1000 @@ -360,12 +357,12 @@ static int tsl2563_get_adc(struct tsl2563_chip *chip) static inline int tsl2563_calib_to_sysfs(u32 calib) { - return (int) (((calib * CALIB_BASE_SYSFS) + - CALIB_FRAC_HALF) >> CALIB_FRAC_BITS); + return (int)DIV_ROUND_CLOSEST(calib * CALIB_BASE_SYSFS, BIT(CALIB_FRAC_BITS)); } static inline u32 tsl2563_calib_from_sysfs(int value) { + /* Make a fraction from a number n that was multiplied with b. */ return (((u32) value) << CALIB_FRAC_BITS) / CALIB_BASE_SYSFS; } From patchwork Wed Dec 7 19:03:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357339wrr; Wed, 7 Dec 2022 11:04:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf7hjaWdnnUzuRS2luaoPz7dhhiAP+Sp41GCL/lZ29xGREo/uCohFPWiaKKLgULvmAqOYhvX X-Received: by 2002:a17:903:1245:b0:187:3921:2b2d with SMTP id u5-20020a170903124500b0018739212b2dmr77914755plh.13.1670439894212; Wed, 07 Dec 2022 11:04:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439894; cv=none; d=google.com; s=arc-20160816; b=uJBphtexl6Eby9KvFajLQwbUZBQYbK/MIOfxGRmHmQyjo0ps0dPFLB6hBaV+mMHwNf BqH8g/NvdGGYTdq5WBvDnc9a0iIyptU4TDFAydjnPy0H5dLgKl36PpPLJPXI6Wmn9l+u bfj0hduv3JoXs/8iIlqDGl3HpqpfHbt6Ju7bGmH2RPiSb2VvHEz1hBDUWRd28U96/QNr DHQTs6zvh+bWLRx+bCZj+4EaIhrMOjl2X9klMYDjj2QTSu5hE5Oaac3Qr69007o3sJ5m wPgWxZN6oI+PEfE2LEJqMruWt+MyKvQiW5JmPLjxaFO/b9jHQpnJnvoWvPFsPRies0dX xTFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JU1hP9ESd/fPMfkj00xS1Eat2XMzm8apvdnvD+xvbKY=; b=htRPxFwJLU7Xt9DuzwDdnx6CzJZX2hO33x+/gsNER7ALBQy0dVBZR2AA/R5S9P44vN 2TDUofDvUjsSERZzvwVoR/9idCmGrNdrB2Jn65qF82tWc1aO/6mtCH3MMJbDOAhlaRSL mrFab8+ScpXD+RjFqwRWEXBYE1Yl4URvRCWkRU/whcionjCJOqNC8X1VMYUXQtGmSsgW 68tOZo5rjiRjRjV9H5xh8g385lZ4S/GeZD3r1MUrBgnXKqSje5wdqxg46nJ69AIGZnqd FBgkiUlQVLD23X81Ra8fGK7UJWm1161jO3hwzyi7YXrqldq30soVt+GI9x+mDmg0JTj+ eH8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IgGqwIkS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h13-20020a17090acf0d00b00219de6cb100si2151958pju.177.2022.12.07.11.04.33; Wed, 07 Dec 2022 11:04:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IgGqwIkS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229778AbiLGTD7 (ORCPT + 99 others); Wed, 7 Dec 2022 14:03:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229761AbiLGTD4 (ORCPT ); Wed, 7 Dec 2022 14:03:56 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9CD6DCDF; Wed, 7 Dec 2022 11:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439835; x=1701975835; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9Y3OtGkyYYjSIDhDns3MoKSTMDiEstJmDjab6GVes+w=; b=IgGqwIkS+0KkDx7A7DfsVZWViJCCInv32rhw4snhsV9fRPDXsdRN1nYv VtUEFO93wvsisIbHu03G6ud5md5U2VMFmmoijc9yfuCpXuPxCZIeOUxaV WwHyiAuWH9kQM2aygeuMWR1mNSjnlhLjtUFGlxk3vRKdilClQci1ODTQ+ XsEyS4Vp8A/TmzL0tSXzhpAcrac/jdUtU8zcKAoMfEsT8wdJT+JRAO4Lv E75gUvCSmIDJhPJkGiHlmt5DBRtEAYDMRYy/8QCk527l+G3wW8zJJoN3/ fJxKnDzwvVAYpn2B4qDUzfgeyAIF+y4PX0Ny1J/4ThBdz4OLglviLwk7U A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="297333247" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="297333247" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="624411152" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="624411152" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 07 Dec 2022 11:03:43 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 183603BC; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 06/11] iio: light: tsl2563: Simplify with dev_err_probe Date: Wed, 7 Dec 2022 21:03:43 +0200 Message-Id: <20221207190348.9347-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583182474760026?= X-GMAIL-MSGID: =?utf-8?q?1751583182474760026?= Code can be a bit simpler with dev_err_probe(). Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index bdd40a5df53d..cce044556293 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -695,12 +695,13 @@ static const struct iio_info tsl2563_info = { static int tsl2563_probe(struct i2c_client *client) { + struct device *dev = &client->dev; struct iio_dev *indio_dev; struct tsl2563_chip *chip; struct tsl2563_platform_data *pdata = client->dev.platform_data; unsigned long irq_flags; - int err = 0; u8 id = 0; + int err; indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip)); if (!indio_dev) @@ -712,16 +713,12 @@ static int tsl2563_probe(struct i2c_client *client) chip->client = client; err = tsl2563_detect(chip); - if (err) { - dev_err(&client->dev, "detect error %d\n", -err); - return err; - } + if (err) + return dev_err_probe(dev, err, "detect error\n"); err = tsl2563_read_id(chip, &id); - if (err) { - dev_err(&client->dev, "read id error %d\n", -err); - return err; - } + if (err) + return dev_err_probe(dev, err, "read id error\n"); mutex_init(&chip->lock); @@ -765,17 +762,13 @@ static int tsl2563_probe(struct i2c_client *client) irq_flags, "tsl2563_event", indio_dev); - if (err) { - dev_err(&client->dev, "irq request error %d\n", -err); - return err; - } + if (err) + return dev_err_probe(dev, err, "irq request error\n"); } err = tsl2563_configure(chip); - if (err) { - dev_err(&client->dev, "configure error %d\n", -err); - return err; - } + if (err) + return dev_err_probe(dev, err, "configure error\n"); INIT_DELAYED_WORK(&chip->poweroff_work, tsl2563_poweroff_work); @@ -784,7 +777,7 @@ static int tsl2563_probe(struct i2c_client *client) err = iio_device_register(indio_dev); if (err) { - dev_err(&client->dev, "iio registration error %d\n", -err); + dev_err_probe(dev, err, "iio registration error\n"); goto fail; } From patchwork Wed Dec 7 19:03:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30995 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp358023wrr; Wed, 7 Dec 2022 11:06:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf5OJE5aJS51NMVYFG9+RKojyZFdXCXU6mpkZUewt2F/GG5LGWfygJpSx5S1mqO7lfFZnSWd X-Received: by 2002:a17:906:448b:b0:7ad:8bd5:b7df with SMTP id y11-20020a170906448b00b007ad8bd5b7dfmr55808491ejo.57.1670439975178; Wed, 07 Dec 2022 11:06:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439975; cv=none; d=google.com; s=arc-20160816; b=PnS8a/Sjrn4zP2WrNJwtQLesCxBpy9UrVx2VeLVhBvMLkhRaTA1iXQsaYgZymVmwsG 8xBl6zG3hWxWlhDUmtT4t/sZsWgDnyh3Z3gbtZGudC1Hqaqpws1qrNgGi6t7JBeUYjDg Wubil+PfJVZZFfj/o7KXC9O4PR77V5f+k6VP2gEAhL4UdcwOTibJG+i311gB91cYOluh IPaGHfas6nXlNwkkh+kQQTbVxvaggvgAyrkg1M9aDF3tJRVpS4vlYZ5aj3u3h9efQlcs uTEQZH532FWbrhYrJrDvqOcp+zPm7oa7TKoP6rpq20EVqDyT7Dwu+ZMV6mF5mOhhNXyk SP2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=r9uGbD3p0GgEMKjsMSCZjW+q1W/jl5DbSLx88fw4cPM=; b=MeVmasP2ZfXnYhK0jdqfl+8I7lQW2DSHprlCDHhdI3n0w9J5ic24zNNzt1uPJ0eFui cMbPjOUcB48c7TQh2E+RxOEaocStq1o19Tuy0mk2SMScQALbjQBgBqiKQpIUrAmkNaLs 1DnMxTr42gjuF5LtgAuRL7t0I6hF6hOxdPipF2dP5FUbQoMlffaNMW4QiIXUKavJG4Qm anRT5U5lmOWTz/8CW/SpkKn/tDv103BEP6uwnplO6DpRR4u2AFI3jn28Gmc84oi1Hmcj xmQA+++ARDFRuSbjcTKkd+8sQWnwIqI9Bfl3bQjPc9b7pUdFDzgi0vd7wN77vXGp9O8z 7oPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gqdFOQFN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u1-20020a1709064ac100b00778d193ca81si13023129ejt.550.2022.12.07.11.05.52; Wed, 07 Dec 2022 11:06:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gqdFOQFN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbiLGTEZ (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbiLGTEE (ORCPT ); Wed, 7 Dec 2022 14:04:04 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A73470616; Wed, 7 Dec 2022 11:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439843; x=1701975843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pgSWEefpffGm7xw97UuMKoDF6VmW2ivy1224gocEp4U=; b=gqdFOQFNPNFK+0am7/MNlQ0RAXfxIeZr6dMEIqsCUYEEhk+Az/okP7aU hWaO/2D4cclnFq9BOxizvopuqOE+KCfKCffYrKP5q6Z2Rg7BBIxWr9tIZ EyUrqji/fMEqrC8HD/C8ey38xqr4cfpRW5KkUXvGYh/yuvHAVEk4+A6Xv XlH87ksMiGuvadPmyDXX1mI/87Hv18uI+/1PWZFsgD3aiUHXduKboTiJn MQ1Q5yN/KV6pOGFZKLgBcg84rSfVWRruhPPlp6yjZnJXCp+gj4kh4jJng Wz+r3cSoPieZBHFbXabs+SqI7wYp5JY8KSnfbJbA1Mrei+8Mc13oAww9o A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690234" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690234" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060671" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060671" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:43 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2FFA954F; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 07/11] iio: light: tsl2563: Drop legacy platform data code Date: Wed, 7 Dec 2022 21:03:44 +0200 Message-Id: <20221207190348.9347-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583267549140291?= X-GMAIL-MSGID: =?utf-8?q?1751583267549140291?= There is no in-kernel user for legacy platform data. Otherwise, a new one can use software nodes instead. Hence, drop legacy platform data code. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 12 ++---------- include/linux/platform_data/tsl2563.h | 9 --------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 include/linux/platform_data/tsl2563.h diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index cce044556293..ed193a3da91e 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -29,7 +29,6 @@ #include #include #include -#include /* Use this many bits for fraction part. */ #define ADC_FRAC_BITS 14 @@ -698,7 +697,6 @@ static int tsl2563_probe(struct i2c_client *client) struct device *dev = &client->dev; struct iio_dev *indio_dev; struct tsl2563_chip *chip; - struct tsl2563_platform_data *pdata = client->dev.platform_data; unsigned long irq_flags; u8 id = 0; int err; @@ -730,14 +728,8 @@ static int tsl2563_probe(struct i2c_client *client) chip->calib0 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS); chip->calib1 = tsl2563_calib_from_sysfs(CALIB_BASE_SYSFS); - if (pdata) { - chip->cover_comp_gain = pdata->cover_comp_gain; - } else { - err = device_property_read_u32(&client->dev, "amstaos,cover-comp-gain", - &chip->cover_comp_gain); - if (err) - chip->cover_comp_gain = 1; - } + chip->cover_comp_gain = 1; + device_property_read_u32(dev, "amstaos,cover-comp-gain", &chip->cover_comp_gain); dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f); indio_dev->name = client->name; diff --git a/include/linux/platform_data/tsl2563.h b/include/linux/platform_data/tsl2563.h deleted file mode 100644 index 9cf9309c3f24..000000000000 --- a/include/linux/platform_data/tsl2563.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __LINUX_TSL2563_H -#define __LINUX_TSL2563_H - -struct tsl2563_platform_data { - int cover_comp_gain; -}; - -#endif /* __LINUX_TSL2563_H */ From patchwork Wed Dec 7 19:03:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp358689wrr; Wed, 7 Dec 2022 11:07:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf7uN9c2SmEc+ZV3DScMMb1nzIXkKWvXFGuDv//iCJENikD+ydm3xSV8K4dMxaizslJUg2HW X-Received: by 2002:a50:fe87:0:b0:46d:5a5c:e3bf with SMTP id d7-20020a50fe87000000b0046d5a5ce3bfmr3651299edt.142.1670440059220; Wed, 07 Dec 2022 11:07:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670440059; cv=none; d=google.com; s=arc-20160816; b=1HoNOJV4+krWxFs8e1+p63eCZhDPNsDczrvjFt1dRSa4D7YJF4AWxuiVb4KBSdgLP+ +o5ILj9UV9zyd1+15UdxoIDuzxZlG735zMsm7W24YgISyXmeAdJttX3n3UDoC7G5DYoM mKkkF3EAwFLpOWFEDDcrIgHYsysUwoHqF2hxg5v1mHK0A4z9BCnKa43pwtPqpqliLuhK HHQp6KsQa/CZKf6B0xE3klTHDWhyRVOSp1/cz1fXaElUJ0wxhPUrNP9ed3eUOfYR94ik ff7FsPpu40AwXQpVHSz3uv//yzSA4VE85x/66VAQ02Ubsy7dWEpA6+yoGJX2ZYPZj2Vq FA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N1JBgm7SiCAGTYweVQSTkMBV2Y+sghRiY1Vq3k9Dq0E=; b=iDCejo5YLT6NIMyHROmoNN36eyc3F6Un9FnUgFixhmgtWU+o+usJOf+m21UROuyeqD gxPK0Xwe2TPGrL1dypHZOpq5FGII7YF0lV9zjwI8wh8dYHkA3rgbVDb/9ZMYL2xFsuh/ g//gTO5/FFelaUwnn6lHqWl5/4WPeP2rqrn4vDF7hNu++jl8d8JAH80uLJgq9Z3B70Ub DhUWDOG0D5OiB2yCYlpfnhOhnHy7fjFEbBsyxnsO0a7tN3d+Pytp+2Ru0U5AoRIjUXtX Vx6AiFEApNbayu834DvbtWA5XNB3Z9gHR9ZHqw9poldifDURd1K484YH59cIY80c08nO C/KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="kliUXD4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga30-20020a1709070c1e00b007c0f5e76449si1618430ejc.326.2022.12.07.11.07.15; Wed, 07 Dec 2022 11:07:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="kliUXD4/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbiLGTE3 (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbiLGTEE (ORCPT ); Wed, 7 Dec 2022 14:04:04 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1FFF7061A; Wed, 7 Dec 2022 11:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439843; x=1701975843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Al6ot08K5G63PiVcb4PsFpdTXyvKTgMvRkFiF1LSefc=; b=kliUXD4/BIWjTTrw216pfAU+xzqnlzlIGo3Bl++qWwrOB7lwJVcPInTE rso+kDZ+OWCosyaDkZwlK3DgDEOWW9bRinhaI4Nx4HIDZZ7GIZ2XgQv+g Sp3v5VrGmMiiKix2D+kpKa+eqwoGMnB2pMhHaldwOdGHtVDeXtAFaMdPO zZgZaB7dMOq92gF+cu87HCGL1Rfb/VBV0gfRC31YdOz6qWevWpsQ3DLD1 cYzUzYgCrWHxeX7L9XlU52IN4rHcIjRtJtBIbeLbm8e6ecv+q1cKwsZdx Xf3xQDkcxl1tV+mMAfkKkWxsXJ5o9VIU5LbufboS2K+ipdHPYFbjZEako A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690239" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690239" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060672" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060672" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3903B4A1; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 08/11] iio: light: tsl2563: Utilise temporary variable for struct device Date: Wed, 7 Dec 2022 21:03:45 +0200 Message-Id: <20221207190348.9347-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583355287661382?= X-GMAIL-MSGID: =?utf-8?q?1751583355287661382?= We have a temporary variable to keep pointer to struct device. Utilise it inside the ->probe() implementation. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index ed193a3da91e..c5814545fd19 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -701,7 +701,7 @@ static int tsl2563_probe(struct i2c_client *client) u8 id = 0; int err; - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip)); + indio_dev = devm_iio_device_alloc(dev, sizeof(*chip)); if (!indio_dev) return -ENOMEM; @@ -731,7 +731,7 @@ static int tsl2563_probe(struct i2c_client *client) chip->cover_comp_gain = 1; device_property_read_u32(dev, "amstaos,cover-comp-gain", &chip->cover_comp_gain); - dev_info(&client->dev, "model %d, rev. %d\n", id >> 4, id & 0x0f); + dev_info(dev, "model %d, rev. %d\n", id >> 4, id & 0x0f); indio_dev->name = client->name; indio_dev->channels = tsl2563_channels; indio_dev->num_channels = ARRAY_SIZE(tsl2563_channels); @@ -748,7 +748,7 @@ static int tsl2563_probe(struct i2c_client *client) irq_flags = IRQF_TRIGGER_RISING; irq_flags |= IRQF_ONESHOT; - err = devm_request_threaded_irq(&client->dev, client->irq, + err = devm_request_threaded_irq(dev, client->irq, NULL, &tsl2563_event_handler, irq_flags, From patchwork Wed Dec 7 19:03:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp358886wrr; Wed, 7 Dec 2022 11:08:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Ew2TXG80Nh6Zdzneh5uFmk12ugXjdipUkNBZMVWDmIh2Ks4IbPlMf6hdDWQGs14GNFciU X-Received: by 2002:aa7:db13:0:b0:46b:aee1:3b46 with SMTP id t19-20020aa7db13000000b0046baee13b46mr8991488eds.44.1670440087201; Wed, 07 Dec 2022 11:08:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670440087; cv=none; d=google.com; s=arc-20160816; b=AB1Nmtqq1W48UFWS57qLhPev3jmWdIwHGPwPQLjXk276hk2DljvKnBoA8s7XOCCWvZ NULzuR+xy+6Oz63rPysjEdYeepyctEE/V+gbH/GkFzMgwTaNEa1FVWyih26qCBOWmUlC Oui9vKUj/RRJvn6wZgTp8RpJJ1R5VfOo/pxes8i2qKsHj7hp7Ox6av2WC5H0Mor4ev5O BzU9OWfGjm0rcwi0wWYJYngyVYegppW8nZZN5jKC+Z671iv6jnQIG1ZjINii4g0lhRua g/s2sgUJJoQUH3iBtk9XWaAVPv982llf2VYa5jhl2eOUEoZ+kpqorf1DQGPVpBySRuKg eSdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EeE/cX3+b6XUp8M/y9uOM9BxwKmzXLAPh5RIfib5znw=; b=oOydT0vPpc6MQaFqm4xGlh8KeNbtC8C+kTDijtCwJzVmpUp+82lil3DgR73ShhVgow 5u6upEC8M+SXVGpKQkKVOn9jcjZEefhR7fpbSAPyUfooo7dLEdN0SN2qf+DTueLmpakK qRUiqRXCNqEhtvAAe/Lnjvh+mkLOpwBsjGmqh1W/ktJJoJfyPafjLES+/ZgB4BT3IlsL mLI7nvBLSw22We2xAhtRtxjf8eP0CmSxI8uVd+yNbgGt3oky4sqn/Qon4Jn1smDWx8cL ONa8qV/hMUPM73+qzT3+E0ZXWkcVU3TaDF1RTJ60akjbpeyY+rK9QQJUdD+SqWvja7XO X/zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Fg/8AxSX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p9-20020a056402074900b00451e0d930dfsi4287906edy.497.2022.12.07.11.07.44; Wed, 07 Dec 2022 11:08:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Fg/8AxSX"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbiLGTEc (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiLGTEF (ORCPT ); Wed, 7 Dec 2022 14:04:05 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D37657061D; Wed, 7 Dec 2022 11:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439843; x=1701975843; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wl+VpQy08drr9NBqnU3E1h7fc0Jv5M6iFmv/BRcElOA=; b=Fg/8AxSXzNF2zOdNj4duFvxkvCcie9CAakBxUIG6oifZ6u1rJv66fh6Z oKGlVRpL7mNXG4GTnTyQSOgyElGISQ8u1zrRoZL7ed/ATmUM38I/2f3zM JxyCgrXO0YVYiHGP/U30nmdjURFRZoWcMzH2Qizkl9SZwznJTU9vWfH+u JIbGOxSNi9fyJHBbB0mrI5XmctxxkX9vU0wZqNrGQVZ5fxHgYMBSErdUg u42Kx7YlXLVzNNLoox3tlHyRvYWbj6Y3btgykzovJmWmP3ZpyQ1ERdFvY uUw0Vw9ga/8K/xnhKIWqNgceRffnrsdLuK2HYVKjjrgtXwmqouF1+rAH2 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="315690243" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="315690243" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="821060673" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="821060673" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 07 Dec 2022 11:03:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4BC1A6CE; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 09/11] iio: light: tsl2563: Use dev_get_drvdata() directly in PM callbacks Date: Wed, 7 Dec 2022 21:03:46 +0200 Message-Id: <20221207190348.9347-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583384945592018?= X-GMAIL-MSGID: =?utf-8?q?1751583384945592018?= PM callbacks take struct device pointer as a parameter, use dev_get_drvdata() to retrieve it instead of unneeded double loop of referencing via i2c_get_clientdata(to_i2c_client(dev)). Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index c5814545fd19..f92190fadffd 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -795,7 +795,7 @@ static void tsl2563_remove(struct i2c_client *client) static int tsl2563_suspend(struct device *dev) { - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + struct iio_dev *indio_dev = dev_get_drvdata(dev); struct tsl2563_chip *chip = iio_priv(indio_dev); int ret; @@ -814,7 +814,7 @@ static int tsl2563_suspend(struct device *dev) static int tsl2563_resume(struct device *dev) { - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + struct iio_dev *indio_dev = dev_get_drvdata(dev); struct tsl2563_chip *chip = iio_priv(indio_dev); int ret; From patchwork Wed Dec 7 19:03:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357845wrr; Wed, 7 Dec 2022 11:05:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Hs77PgZqJsRfdZhReXmp6q/jPnnfIHCUeYpMTfHADpNkGlls7iCsZwFCzjJz+6W3nqo4S X-Received: by 2002:a17:902:7d94:b0:187:4920:3a7e with SMTP id a20-20020a1709027d9400b0018749203a7emr80666747plm.171.1670439954454; Wed, 07 Dec 2022 11:05:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439954; cv=none; d=google.com; s=arc-20160816; b=tr/BJaAfcXFpoR2ncp7kO2E8cvUTE8FL9gCLv3swrqSriXCwOzPfePNhcNEuP/HpwL scns5s6Ipg8U3kudzS+9OWP8kgqznqd+KtVeGKpQs4Pz/BklvX02Tvr+331y84NnrByA INWIqr5RoA1nIUDMFqLvDsvXwfUrTy63jF1/j1gZRrbZ3b6yK/0mUHh/+BIBOIbmH+g4 uUoLFJHur9aR7I5J65lvKEFjIHmxkhj9vmjGIGOuXGWABibLIciJtFKTGLmQjoWfvLEx e3SX89MXCKeU9I6+JFb6BxSvppUyqKwUU5BjuZIirH+Y6hYqMk7bIWkvTKhydBtegXEk /VvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XrEUlbHuEXSVXKxLQfMzSPIJ+T8PkqYci9ySh2Qf/po=; b=JtVbk1cWypRA65FtpQH7jG8EPBaMvAGgoeSJnGQ1Nn90ZgpDMW2eyNZI2kQUeOzGsk TTgkE+D65b1ZObpv88YJtRU0n00Kg+eJBEkMhuQGAAYXY9qx+WLOHp/gdoqPJDogSkbJ w1Bu4pD0qk5m1RAM457p5O8IX4FE5vPkxnL/7mUkj5LRCRYUA+kp3C7eOxVRJvkQXPFz sR+GglzzxPpHB0rMHz7bU48EzIq23ayrzx5RRC1rrTe5pAW7Z9VFGHrU35EsThxbHQHV EArEtxnZqXVf5r8e+NHo4EGGSWTEXFu+Vo1itleIi5VNfTTVo1+09uTmh23DGT/rU3ih v5Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mGlGkLQ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 63-20020a630042000000b00478d9009c01si6791015pga.22.2022.12.07.11.05.24; Wed, 07 Dec 2022 11:05:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mGlGkLQ5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229796AbiLGTEF (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbiLGTD6 (ORCPT ); Wed, 7 Dec 2022 14:03:58 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51DE06F0E9; Wed, 7 Dec 2022 11:03:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439837; x=1701975837; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OnC3gSlrO1t+XETiAEwCFw4xmz5yXm4O4Aj0g0fKpiI=; b=mGlGkLQ5D68smF+UtavYX27lvWkOrCrz3cgBxTKAk+5dbWReoh3Z/dj3 ozy4k870KpgNL+9YFMWsUtP1QiekFNvBwYgn+FeXDP1KSXbJpOgb3WORR 6kfm3On6KipaSyhLuv19RYifwL9exoLWLRsyheGheNq5oJzuv916qBt3d f0v2Ek0/AUq4JYJ/Gxipv/fmJmWxYuxwWtq2Lq3bWoo0/DhU+SI9uzgDd QgUzP4jlvTIHxg8MUF538TWXVdWjwZiRMMuHxGfemEYiOKCLG0MNGtooP l5heIrI310ScOoktRRUcGcmDnWIEIG/QASMbjfa6y0TXPxzJ6MBjRntL8 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="297333257" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="297333257" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="624411155" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="624411155" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 07 Dec 2022 11:03:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 50D5C6B1; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 10/11] iio: light: tsl2563: sort header inclusion alphabetically Date: Wed, 7 Dec 2022 21:03:47 +0200 Message-Id: <20221207190348.9347-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583245679836850?= X-GMAIL-MSGID: =?utf-8?q?1751583245679836850?= Sort header inclusion alphabetically. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/tsl2563.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iio/light/tsl2563.c b/drivers/iio/light/tsl2563.c index f92190fadffd..f2f55239a072 100644 --- a/drivers/iio/light/tsl2563.c +++ b/drivers/iio/light/tsl2563.c @@ -12,23 +12,23 @@ */ #include -#include -#include -#include +#include +#include #include #include #include -#include #include +#include +#include #include -#include #include -#include +#include +#include #include +#include #include #include -#include /* Use this many bits for fraction part. */ #define ADC_FRAC_BITS 14 From patchwork Wed Dec 7 19:03:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 30991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp357803wrr; Wed, 7 Dec 2022 11:05:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf41V/iYw5DwTQ5caKv0ntdtN0zuHu4x1ia3vWfZ82JKD5kE09JiW9QRPekZMTcs2KtAF/4h X-Received: by 2002:a17:902:dac6:b0:189:7105:59e8 with SMTP id q6-20020a170902dac600b00189710559e8mr56319597plx.50.1670439949289; Wed, 07 Dec 2022 11:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670439949; cv=none; d=google.com; s=arc-20160816; b=rHlcjygC1nGi/f297LPZcLiECnuWh1TmyzhQD4cnqllqB6XZ8O5Ci9JOkWH9FEQwlP MjORknYLACCRd8K3kHi1czpsQYNdXBrA6I9Y4qKp8meahXY5FPCPD81KZ5oyN1zlSLsr O0cVY6BmGcms6gL3b1eeJ/oKRenILnG9NRM8qEHbtBDfVWDf+wYmX7rmviUpy1n43A3y t8erdHbkItsxNazwF1wRRzTYbLd2oKfBx0ZIpgEPgsPkB9A4m1VJ3GFIYIkpK1byUK4f JTUDhcMSqS33UTbGLBcddgGAx9Jwz7HzE7OZjE+Egr9Uoe/lzjdgOGtNqh6eVaz3CXMW GdyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AWhacIHGvcAsw3t09alvPJA5sexA8j8qUstDsdH9MWI=; b=qcdteqrK61jubQQyjBAfEwuh7YzItFX23a2nhF2LC6JNJ3Q0oivwdCothX+fmbPbsK 09nGg5xeJGMAzyjnlqgOkpns2jY/2qeF/9S8YEO8l32P9H+QVudvRS81353Cov6C8yOq EK15pJZuGT+qQS0To8VGF6y7XUDqNf7VaANZ03JEhaqY6MyAGSV5o1HiqrzMCFzVRBUF sFHmfIJjJS5bbyo35aHBRTj5S8DtkWwqjrpmHSbfyU2EaBzccdcEY8KV0inz9lCJj33p WNfBcsZFaaRD7v8/RDwUd+6pFDLDfAB32kYchv/yz9Kzz28Dek3cFKQDzNNDCrTN58w/ 2Wlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eHrF9AhU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k14-20020a056a00134e00b005730a1bbac0si21849111pfu.354.2022.12.07.11.05.34; Wed, 07 Dec 2022 11:05:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eHrF9AhU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229782AbiLGTEC (ORCPT + 99 others); Wed, 7 Dec 2022 14:04:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbiLGTD5 (ORCPT ); Wed, 7 Dec 2022 14:03:57 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A03EA6F0E7; Wed, 7 Dec 2022 11:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670439836; x=1701975836; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kRKffxZn4Nwkxtj4PMXku1hJbrP2Pgxr1T1rdf7i76o=; b=eHrF9AhU4hKYOagO/YNGBew4CawukbDcRlOxQZuNtMj8MhfQRBu0T7ag lLZspWvv/JxgpxWbEOS6N2K9osig/AiplKLTJFsaW6B2EYTIAdEHd4Ph2 WC4NzIorq3inum1VCtXKLcemGbTAE0EWbpz3Siqv3Jmbsq3EeXlHPPIpR 3k2AmBkMNu4WP9sAQipsRBhQVT09ztZZY2i4RQEFmc0zk1LtOE6nKSuCi PAG19PQeH5d2DYO4dLVY/7/9lNyq13Uy3yJpHCEdFLh/QuSEDo+SSno96 CEfX/q2q0j8T4Qb1ESgCkzm6TvXOwsiI+dpqyetx2oZCDm8FsOUe9rHyY Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="297333251" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="297333251" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 11:03:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="624411154" X-IronPort-AV: E=Sophos;i="5.96,225,1665471600"; d="scan'208";a="624411154" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 07 Dec 2022 11:03:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5F418801; Wed, 7 Dec 2022 21:04:09 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org Cc: Jonathan Cameron , Lars-Peter Clausen , Ferry Toth Subject: [PATCH v1 11/11] iio: light: tsl2563: Keep Makefile sorted by module name Date: Wed, 7 Dec 2022 21:03:48 +0200 Message-Id: <20221207190348.9347-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> References: <20221207190348.9347-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751583240213077294?= X-GMAIL-MSGID: =?utf-8?q?1751583240213077294?= The Makefile is sorted by a module name, keep it that way. Signed-off-by: Andy Shevchenko Tested-by: Ferry Toth --- drivers/iio/light/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index 6f23817fae6f..d74d2b5ff14c 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile @@ -39,7 +39,6 @@ obj-$(CONFIG_NOA1305) += noa1305.o obj-$(CONFIG_OPT3001) += opt3001.o obj-$(CONFIG_PA12203001) += pa12203001.o obj-$(CONFIG_RPR0521) += rpr0521.o -obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o obj-$(CONFIG_SI1133) += si1133.o obj-$(CONFIG_SI1145) += si1145.o obj-$(CONFIG_STK3310) += stk3310.o @@ -48,6 +47,7 @@ obj-$(CONFIG_ST_UVIS25_I2C) += st_uvis25_i2c.o obj-$(CONFIG_ST_UVIS25_SPI) += st_uvis25_spi.o obj-$(CONFIG_TCS3414) += tcs3414.o obj-$(CONFIG_TCS3472) += tcs3472.o +obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o obj-$(CONFIG_TSL2583) += tsl2583.o obj-$(CONFIG_TSL2591) += tsl2591.o obj-$(CONFIG_TSL2772) += tsl2772.o