From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C050E3A873A for ; Sun, 14 Jun 2026 13:19:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781443154; cv=none; b=bPiZRR7jdAU1I94j+ctCX7WipSKu4WV/jhXq2SL5wAjfLimCxZL7U6/Ur25ZWMQ57siKgTgHme9YNC2MT2tC1i9Np9ExnE+D1KK0Qkgq10z1eplNC6WWvOb0hKE/+kUrL1+f/RK0kbjcJNOXy+LrFtvj15UcM1UhbhwO862WXMA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781443154; c=relaxed/simple; bh=sqql6YoPfNzQRgyL2Bgucfk1ta32mSgMpwD6uFvjry8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QWodyWCeFb9p2gOdEJRb0jiOjqfKpNEgqArNCAEd/ok+zStP0vFgNvId1n6sr9defmWc+9mLskLAv7AnA0WwKm01ZH5yGjM3SSW2yDfN4d+IdRN8EtDVHOLuna5pMB+/icRIw+fYpJwvH9uoW3dZWIC3ulKpp3Z3sbr32Jz2/ps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HWWPG40n; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HWWPG40n" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-45ef5146b56so2109936f8f.0 for ; Sun, 14 Jun 2026 06:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781443151; x=1782047951; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=scrsNXORjV/hTJgu04sgSfBQacqOoCGoNdmUQAeULkg=; b=HWWPG40nRbFZsMCmGr9AVCarTsjUPEa7Rwds8q1VVIHX3s1CPjiin6WJim0llEv5/8 IBJ5818p1Y5a088jcs0HLFgIwmsbOTYlPNYtoIxyfC4CAl9n1moQGRn7zEDbBHM5MTkB t94U8xuhljAq6IdMHBmgLk4pGhTKR5xdHK1WjRoVNWuH+fTirwBlh86y3c9Svqb6BBXN 9KNsJxYj2qYuZS+YX0s8p7lmg2oe4TW+SVJNNTiN32rZb7vMuEYjz89tFpzONN59QdPZ 9uAFKEq8cXNjyGyGEWA3sJMc9w+FQHx+Kor/gkDo2rokZXBxz0XfXD+JMgm5vsp3mG1U YpNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781443151; x=1782047951; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=scrsNXORjV/hTJgu04sgSfBQacqOoCGoNdmUQAeULkg=; b=Sow1vBeFDLGXE27OVAxuBzkF46gON07K/h33pfFEq84HorQzBQODZKu+dyaew+IPyU CcvMmllt49tr+vlT5d0EmWp7OlVSRxdY3HwxNdnVMl0aWaHBXem1MYh1ull2qtnl/F4z HLigv8ULRl8Dd3kkn6MFhJO0NEa/ZG4N/H68BSoN4Xr+6y9k6QwZe8v0z+A6OTzcXRUj /+F3Gbapof/tZ3qo6tkx81v3qhU3rmPxHCEoWtwH9c0+hR75UA9BYuoSpFspgPHkMues r+nGJlHdKeaXrkPN4v9WVcfbIMUzQiQuyt7BcvVjaLg88kpvDrJSNnX+DjYrUXZxC0Mp sUKg== X-Forwarded-Encrypted: i=1; AFNElJ8e4E43l/ipzcDwtJ+SHmYvxaduDiUHGPGGlwYdC3tnUO/JD0TP8OBWusM1ZtOOztCMf7btm5pq7jKfCYI=@vger.kernel.org X-Gm-Message-State: AOJu0YyWuXz1RtQnffkYq/MgXC9ctxToMMLwKKE90BmX6WsH2JgYik3W v2f8Si5jyD3sC+OUktBPa9rId7rvLyZptrf9N7AEgPfi+rEhEKNVKwYeKFJgdA== X-Gm-Gg: Acq92OFt6U0/m0N8Ak5S8u0flGxhBs71DBPDKSls9C91Y5Gc7JoGNKtPbYOhhnX3f6C /Eo7rUjdxIzqQcB2g+Kc0hOK+zYK7kV5D3U6fWuxNRQpmQtYjSb3AhmshFz2uqMmQUFjtltsTZq 7Q6YCkZOglDZFI9UUbwA+KRqVES+PPV0oKinKIfSi9AEn5fMLaE1l/kjFTeFFbp8bbFCT1WBFWM Z1Q5ZdPUcIur5Mqr1wkaYhMAi6Zkl3PgjN1aG2PJCJAvZMJ207MH4sxet7Rcz+OjQNMQtvaks6n juJiVcjgXf4Wjvtaek8e8inL1qy5A2/C1lyOikvHoRkBFGQ/HlZqBj2k6v3SSSjaIKe7xh3oa3Q 3hc2XXa4GZWU7qvSPXzloKGJAAQ5/Uv9DFdIjzxAKv7PUgBOQhKbPb/5LVYwBaaXlDJyMS1Yjlo nZ6lgi4PxUkNcxiyb09zQbYZxamXzQPO3BpVCKbXTsI3xMtBhVTV6+CMyEFE0NRuMzhTnY3v+xW wTS3E6oimFY0nI9oEBmUIHrR00ISuZZuxZvn4c6b+usrkDK5z7+p2yMCGbEDrLkz3/4NZxPxyxS WjNTBosG3fYDhEQop68hNhMjCg0H04TQG++q35/0hCJHaM7tfik= X-Received: by 2002:a05:600c:1d02:b0:489:32b:ac0b with SMTP id 5b1f17b1804b1-490ec48fec5mr111338245e9.6.1781443150995; Sun, 14 Jun 2026 06:19:10 -0700 (PDT) Received: from [192.168.1.187] ([2a02:8308:4092:11f0:c287:187e:fb7a:66a4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4922037055csm168406355e9.13.2026.06.14.06.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 06:19:10 -0700 (PDT) From: Joshua Crofts Date: Sun, 14 Jun 2026 15:19:09 +0200 Subject: [PATCH v6 7/8] iio: light: opt3001: switch driver to managed resources Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260614-opt3001-cleanup-v6-7-e3f5901dcc26@gmail.com> References: <20260614-opt3001-cleanup-v6-0-e3f5901dcc26@gmail.com> In-Reply-To: <20260614-opt3001-cleanup-v6-0-e3f5901dcc26@gmail.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Joshua Crofts X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1781443145; l=4217; i=joshua.crofts1@gmail.com; s=20260530; h=from:subject:message-id; bh=sqql6YoPfNzQRgyL2Bgucfk1ta32mSgMpwD6uFvjry8=; b=J0F7IeZe38xl4iF21sORnXKyNuVc5Gebtzzll6nlKU36q+v05xD3qzbICAsED9nrn08178gC/ T0NMBolcA08CwXi94ik+uTqYzO4lJw/Il2GGAaI2mRo5DVtRE31VQbl X-Developer-Key: i=joshua.crofts1@gmail.com; a=ed25519; pk=RTDOoVwgeL4oFdASj9U+cxJuIjXuXk73zkjnGOJKbEo= Move the driver to use devm_* functions to automate resource management and simplify error handling. This also allows removal of the opt3001_remove() function. Signed-off-by: Joshua Crofts --- drivers/iio/light/opt3001.c | 88 ++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 50 deletions(-) diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c index a4d626006eb3..b657aa88c1b4 100644 --- a/drivers/iio/light/opt3001.c +++ b/drivers/iio/light/opt3001.c @@ -703,6 +703,30 @@ static int opt3001_read_id(struct opt3001 *opt) return 0; } +static void opt3001_power_off(void *data) +{ + struct opt3001 *opt = data; + struct i2c_client *client = opt->client; + struct device *dev = &client->dev; + u16 reg_val; + int ret; + + ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION); + if (ret < 0) { + dev_err(dev, "failed to read register %02x\n", + OPT3001_CONFIGURATION); + return; + } + + reg_val = ret; + opt3001_set_mode(opt, ®_val, OPT3001_CONFIGURATION_M_SHUTDOWN); + + ret = i2c_smbus_write_word_swapped(client, OPT3001_CONFIGURATION, reg_val); + if (ret < 0) + dev_err(dev, "failed to write to register %02x\n", + OPT3001_CONFIGURATION); +} + static int opt3001_configure(struct opt3001 *opt) { struct i2c_client *client = opt->client; @@ -741,6 +765,11 @@ static int opt3001_configure(struct opt3001 *opt) return dev_err_probe(dev, ret, "failed to write register %02x\n", OPT3001_CONFIGURATION); + ret = devm_add_action_or_reset(dev, opt3001_power_off, opt); + if (ret) + return dev_err_probe(dev, ret, + "failed to register power off function\n"); + ret = i2c_smbus_read_word_swapped(client, OPT3001_LOW_LIMIT); if (ret < 0) return dev_err_probe(dev, ret, "failed to read register %02x\n", @@ -834,9 +863,11 @@ static int opt3001_probe(struct i2c_client *client) opt->client = client; opt->chip_info = i2c_get_match_data(client); - mutex_init(&opt->lock); + ret = devm_mutex_init(dev, &opt->lock); + if (ret) + return ret; + init_waitqueue_head(&opt->result_ready_queue); - i2c_set_clientdata(client, iio); if (opt->chip_info->has_id) { ret = opt3001_read_id(opt); @@ -856,60 +887,18 @@ static int opt3001_probe(struct i2c_client *client) /* Make use of INT pin only if valid IRQ no. is given */ if (irq > 0) { - ret = request_threaded_irq(irq, NULL, opt3001_irq, - IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - "opt3001", iio); + ret = devm_request_threaded_irq(dev, irq, NULL, opt3001_irq, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "opt3001", iio); if (ret) - return dev_err_probe(dev, ret, - "failed to request IRQ #%d\n", - irq); + return ret; opt->use_irq = true; } else { dev_dbg(dev, "enabling interrupt-less operation\n"); } - ret = iio_device_register(iio); - if (ret) - goto free_irq; - - return 0; - -free_irq: - if (irq > 0) - free_irq(irq, iio); - - return ret; -} - -static void opt3001_remove(struct i2c_client *client) -{ - struct iio_dev *iio = i2c_get_clientdata(client); - struct opt3001 *opt = iio_priv(iio); - struct device *dev = &client->dev; - int ret; - u16 reg; - - iio_device_unregister(iio); - - if (opt->use_irq) - free_irq(client->irq, iio); - - ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_CONFIGURATION); - return; - } - - reg = ret; - opt3001_set_mode(opt, ®, OPT3001_CONFIGURATION_M_SHUTDOWN); - - ret = i2c_smbus_write_word_swapped(client, OPT3001_CONFIGURATION, reg); - if (ret < 0) { - dev_err(dev, "failed to write register %02x\n", - OPT3001_CONFIGURATION); - } + return devm_iio_device_register(dev, iio); } static const struct opt3001_chip_info opt3001_chip_information = { @@ -950,7 +939,6 @@ MODULE_DEVICE_TABLE(of, opt3001_of_match); static struct i2c_driver opt3001_driver = { .probe = opt3001_probe, - .remove = opt3001_remove, .id_table = opt3001_id, .driver = { -- 2.54.0