mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 14:41:39 +00:00
leds: is31fl319x: Wrap mutex_destroy() for devm_add_action_or_rest()
Clang complains that devm_add_action() takes a parameter with a wrong type: warning: cast from 'void (*)(struct mutex *)' to 'void (*)(void *)' converts to incompatible function type [-Wcast-function-type-strict] err = devm_add_action(dev, (void (*)(void *))mutex_destroy, &is31->lock); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. It appears that the commite1af5c8155
("leds: is31fl319x: Fix devm vs. non-devm ordering") missed two things: - whilst the commit mentions devm_add_action_or_reset() the actual change utilised devm_add_action() call by mistake - strictly speaking the parameter is not compatible by type Fix both issues by switching to devm_add_action_or_reset() and adding a wrapper for mutex_destroy() call. Reported-by: kernel test robot <lkp@intel.com> Fixes:e1af5c8155
("leds: is31fl319x: Fix devm vs. non-devm ordering") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tested-by: Vincent Knecht <vincent.knecht@mailoo.org> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20221228093238.82713-1-andriy.shevchenko@linux.intel.com
This commit is contained in:
parent
4934630409
commit
a82c7cf803
@ -495,6 +495,11 @@ static inline int is31fl3196_db_to_gain(u32 dezibel)
|
||||
return dezibel / IS31FL3196_AUDIO_GAIN_DB_STEP;
|
||||
}
|
||||
|
||||
static void is31f1319x_mutex_destroy(void *lock)
|
||||
{
|
||||
mutex_destroy(lock);
|
||||
}
|
||||
|
||||
static int is31fl319x_probe(struct i2c_client *client)
|
||||
{
|
||||
struct is31fl319x_chip *is31;
|
||||
@ -511,7 +516,7 @@ static int is31fl319x_probe(struct i2c_client *client)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_init(&is31->lock);
|
||||
err = devm_add_action(dev, (void (*)(void *))mutex_destroy, &is31->lock);
|
||||
err = devm_add_action_or_reset(dev, is31f1319x_mutex_destroy, &is31->lock);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user