From patchwork Wed Jul 15 12:59:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 6798551 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A4C2C9F2F0 for ; Wed, 15 Jul 2015 13:03:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C503D204D8 for ; Wed, 15 Jul 2015 13:03:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E220A204D2 for ; Wed, 15 Jul 2015 13:03:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751796AbbGONAr (ORCPT ); Wed, 15 Jul 2015 09:00:47 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:35169 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752698AbbGONAp (ORCPT ); Wed, 15 Jul 2015 09:00:45 -0400 Received: by pdrg1 with SMTP id g1so24804348pdr.2; Wed, 15 Jul 2015 06:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B+x82A1sThPVYTKjxHtrlU1IJ6rx7Uuv4NQ4NAoK08E=; b=iPxCj7z+fiFbzdzBT5/HbzAnysXndgeNJxuyEiFvR1SN3Ql6Mmv6sD/DZR91IjaUdg tfiO6880OdbXDQfIPgiL34QGGZeDuDB2uvf72TeomQhRi8WkaqnwS7m5Bo4vIViXfqqe U0t7NIhfsmC3QXqXevyc1yshBnnG030TQjOie41V5SyB4ZnxOblR8GiokhqdgEit9Far we7nifntgN5SHKLEykZF2UnHTm6hGoNA9EO1DDDBBJ5TNBcn9KmdsOpx7+HIekRVGbE6 X2Z3D3bp039lWM1hF/tOTTL8DWN38ThKa7pxH++KS64taau1vV/Sm1vdT5MzwmGnUQnN t/kg== X-Received: by 10.67.4.138 with SMTP id ce10mr8095652pad.102.1436965244542; Wed, 15 Jul 2015 06:00:44 -0700 (PDT) Received: from localhost.localdomain ([125.130.175.98]) by smtp.gmail.com with ESMTPSA id ri11sm4626783pbb.92.2015.07.15.06.00.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Jul 2015 06:00:43 -0700 (PDT) From: Krzysztof Kozlowski To: David Woodhouse , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-pm@vger.kernel.org, linux-leds@vger.kernel.org Cc: Chanwoo Choi , MyungJoo Ham , Dmitry Torokhov , Samuel Ortiz , Lee Jones , Sebastian Reichel , Dmitry Eremin-Solenikov , Bryan Wu , Richard Purdie , Jacek Anaszewski , Krzysztof Kozlowski Subject: [PATCH v5 2/9] mfd: max77693: Store I2C device type as enum and add default unknown Date: Wed, 15 Jul 2015 21:59:48 +0900 Message-Id: <1436965195-8899-3-git-send-email-k.kozlowski.k@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436965195-8899-1-git-send-email-k.kozlowski.k@gmail.com> References: <1436965195-8899-1-git-send-email-k.kozlowski.k@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Store the device type (obtained from i2c_device_id) as an enum and add a default type of unknown to distinguish from case when this is not set at all. Signed-off-by: Krzysztof Kozlowski Acked-by: Lee Jones --- include/linux/mfd/max77693-private.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index ad67b8235a8d..e3c0afff38d3 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h @@ -529,13 +529,18 @@ enum max77693_irq_muic { MAX77693_MUIC_IRQ_NR, }; +enum max77693_types { + TYPE_MAX77693_UNKNOWN, + TYPE_MAX77693, +}; + struct max77693_dev { struct device *dev; struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ struct i2c_client *muic; /* 0x4A , MUIC */ struct i2c_client *haptic; /* 0x90 , Haptic */ - int type; + enum max77693_types type; struct regmap *regmap; struct regmap *regmap_muic; @@ -549,8 +554,4 @@ struct max77693_dev { int irq; }; -enum max77693_types { - TYPE_MAX77693, -}; - #endif /* __LINUX_MFD_MAX77693_PRIV_H */