Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752596AbZK3Lqu (ORCPT ); Mon, 30 Nov 2009 06:46:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752525AbZK3Lqt (ORCPT ); Mon, 30 Nov 2009 06:46:49 -0500 Received: from smtp.nokia.com ([192.100.105.134]:55474 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752500AbZK3Lqs (ORCPT ); Mon, 30 Nov 2009 06:46:48 -0500 From: Amit Kucheria To: List Linux Kernel Cc: rui.zhang@intel.com, jic23@cam.ac.uk, khali@linux-fr.org, alan@linux.intel.com, linux-acpi@vger.kernel.org, gregkh@suse.de Subject: [PATCH 2/2] als: add unique device-ids to the als device class Date: Mon, 30 Nov 2009 13:46:38 +0200 Message-Id: <1259581598-16176-1-git-send-email-amit.kucheria@verdurent.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1259581514-15356-1-git-send-email-amit.kucheria@verdurent.com> References: <1259581514-15356-1-git-send-email-amit.kucheria@verdurent.com> X-OriginalArrivalTime: 30 Nov 2009 11:46:28.0649 (UTC) FILETIME=[C0D08990:01CA71B2] X-Nokia-AV: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3414 Lines: 118 Other devices classes such as hwmon and input class handle assignment of unique device-ids inside the core functions instead of pushing it out to individual drivers. This reduces code duplication and resulting bugs. V2 - Updated the header to reflect the change is signature of als_device_register(). Thanks to Jean for the review. V1 - Add capability to als core to create unique ids Signed-off-by: Amit Kucheria Acked-by: Jean Delvare Acked-by: Jonathan Cameron --- drivers/als/als_sys.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- include/linux/als_sys.h | 2 +- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/drivers/als/als_sys.c b/drivers/als/als_sys.c index e1d6395..aa15ad8 100644 --- a/drivers/als/als_sys.c +++ b/drivers/als/als_sys.c @@ -26,22 +26,55 @@ #include #include #include +#include MODULE_AUTHOR("Zhang Rui "); MODULE_DESCRIPTION("Ambient Light Sensor sysfs/class support"); MODULE_LICENSE("GPL"); +#define ALS_ID_PREFIX "als" +#define ALS_ID_FORMAT ALS_ID_PREFIX "%d" + static struct class *als_class; +static DEFINE_IDR(als_idr); +static DEFINE_SPINLOCK(idr_lock); + /** * als_device_register - register a new Ambient Light Sensor class device * @parent: the device to register. * * Returns the pointer to the new device */ -struct device *als_device_register(struct device *dev, char *name) +struct device *als_device_register(struct device *dev) { - return device_create(als_class, dev, MKDEV(0, 0), NULL, name); + int id, err; + struct device *alsdev; + +again: + if (unlikely(idr_pre_get(&als_idr, GFP_KERNEL) == 0)) + return ERR_PTR(-ENOMEM); + + spin_lock(&idr_lock); + err = idr_get_new(&als_idr, NULL, &id); + spin_unlock(&idr_lock); + + if (unlikely(err == -EAGAIN)) + goto again; + else if (unlikely(err)) + return ERR_PTR(err); + + id = id & MAX_ID_MASK; + alsdev = device_create(als_class, dev, MKDEV(0, 0), NULL, + ALS_ID_FORMAT, id); + + if (IS_ERR(alsdev)) { + spin_lock(&idr_lock); + idr_remove(&als_idr, id); + spin_unlock(&idr_lock); + } + + return alsdev; } EXPORT_SYMBOL(als_device_register); @@ -51,7 +84,16 @@ EXPORT_SYMBOL(als_device_register); */ void als_device_unregister(struct device *dev) { - device_unregister(dev); + int id; + + if (likely(sscanf(dev_name(dev), ALS_ID_FORMAT, &id) == 1)) { + device_unregister(dev); + spin_lock(&idr_lock); + idr_remove(&als_idr, id); + spin_unlock(&idr_lock); + } else + dev_dbg(dev->parent, + "als_device_unregister() failed: bad class ID!\n"); } EXPORT_SYMBOL(als_device_unregister); diff --git a/include/linux/als_sys.h b/include/linux/als_sys.h index 500f300..41793f7 100644 --- a/include/linux/als_sys.h +++ b/include/linux/als_sys.h @@ -29,7 +29,7 @@ #define ALS_ILLUMINANCE_MIN 0 #define ALS_ILLUMINANCE_MAX -1 -struct device *als_device_register(struct device *dev, char *name); +struct device *als_device_register(struct device *dev); void als_device_unregister(struct device *dev); #endif /* __ALS_SYS_H__ */ -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/