From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbcDRVUx (ORCPT ); Mon, 18 Apr 2016 17:20:53 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34163 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbcDRVUw (ORCPT ); Mon, 18 Apr 2016 17:20:52 -0400 Date: Mon, 18 Apr 2016 14:20:48 -0700 From: Dmitry Torokhov To: "H. Nikolaus Schaller" Cc: Fabio Estevam , Peter Ujfalusi , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pyra-handheld.com, letux-kernel@openphoenux.org Subject: Re: [PATCH 5/5] input: twl6040-vibra: remove mutex Message-ID: <20160418212048.GB1006@dtor-ws> References: <592912a81a86fe0c9b5eaf3407cc5c4e1bfef9fe.1461009340.git.hns@goldelico.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <592912a81a86fe0c9b5eaf3407cc5c4e1bfef9fe.1461009340.git.hns@goldelico.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 18, 2016 at 09:55:41PM +0200, H. Nikolaus Schaller wrote: > The mutex does not seem to be needed. twl6040_vibra_suspend() and vibra_play_work() may run concurrently, no? > twl4030-vibra doesn't > use one either. It probably should. Thanks. > > Signed-off-by: H. Nikolaus Schaller > --- > drivers/input/misc/twl6040-vibra.c | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c > index 69c5940..dcc926b 100644 > --- a/drivers/input/misc/twl6040-vibra.c > +++ b/drivers/input/misc/twl6040-vibra.c > @@ -46,7 +46,7 @@ struct vibra_info { > struct device *dev; > struct input_dev *input_dev; > struct work_struct play_work; > - struct mutex mutex; > + > int irq; > > bool enabled; > @@ -182,8 +182,6 @@ static void vibra_play_work(struct work_struct *work) > struct vibra_info *info = container_of(work, > struct vibra_info, play_work); > > - mutex_lock(&info->mutex); > - > if (info->weak_speed || info->strong_speed) { > if (!info->enabled) > twl6040_vibra_enable(info); > @@ -192,7 +190,6 @@ static void vibra_play_work(struct work_struct *work) > } else if (info->enabled) > twl6040_vibra_disable(info); > > - mutex_unlock(&info->mutex); > } > > static int vibra_play(struct input_dev *input, void *data, > @@ -223,12 +220,8 @@ static void twl6040_vibra_close(struct input_dev *input) > > cancel_work_sync(&info->play_work); > > - mutex_lock(&info->mutex); > - > if (info->enabled) > twl6040_vibra_disable(info); > - > - mutex_unlock(&info->mutex); > } > > static int __maybe_unused twl6040_vibra_suspend(struct device *dev) > @@ -236,13 +229,9 @@ static int __maybe_unused twl6040_vibra_suspend(struct device *dev) > struct platform_device *pdev = to_platform_device(dev); > struct vibra_info *info = platform_get_drvdata(pdev); > > - mutex_lock(&info->mutex); > - > if (info->enabled) > twl6040_vibra_disable(info); > > - mutex_unlock(&info->mutex); > - > return 0; > } > > @@ -301,8 +290,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev) > return -EINVAL; > } > > - mutex_init(&info->mutex); > - > error = devm_request_threaded_irq(&pdev->dev, info->irq, NULL, > twl6040_vib_irq_handler, > IRQF_ONESHOT, > -- > 2.7.3 > -- Dmitry