Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i2c: dev: fix notifier return values

We have a set of return values that notifier callbacks can return. They
should not return 0, error codes or anything other than those predefined
values. Make the i2c character device's callback return NOTIFY_DONE or
NOTIFY_OK depending on the situation.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

authored by

Bartosz Golaszewski and committed by
Wolfram Sang
cddf70d0 681eb167

+8 -8
+8 -8
drivers/i2c/i2c-dev.c
··· 653 653 int res; 654 654 655 655 if (dev->type != &i2c_adapter_type) 656 - return 0; 656 + return NOTIFY_DONE; 657 657 adap = to_i2c_adapter(dev); 658 658 659 659 i2c_dev = get_free_i2c_dev(adap); 660 660 if (IS_ERR(i2c_dev)) 661 - return PTR_ERR(i2c_dev); 661 + return NOTIFY_DONE; 662 662 663 663 cdev_init(&i2c_dev->cdev, &i2cdev_fops); 664 664 i2c_dev->cdev.owner = THIS_MODULE; ··· 678 678 goto err_put_i2c_dev; 679 679 680 680 pr_debug("adapter [%s] registered as minor %d\n", adap->name, adap->nr); 681 - return 0; 681 + return NOTIFY_OK; 682 682 683 683 err_put_i2c_dev: 684 684 put_i2c_dev(i2c_dev, false); 685 - return res; 685 + return NOTIFY_DONE; 686 686 } 687 687 688 688 static int i2cdev_detach_adapter(struct device *dev, void *dummy) ··· 691 691 struct i2c_dev *i2c_dev; 692 692 693 693 if (dev->type != &i2c_adapter_type) 694 - return 0; 694 + return NOTIFY_DONE; 695 695 adap = to_i2c_adapter(dev); 696 696 697 697 i2c_dev = i2c_dev_get_by_minor(adap->nr); 698 698 if (!i2c_dev) /* attach_adapter must have failed */ 699 - return 0; 699 + return NOTIFY_DONE; 700 700 701 701 put_i2c_dev(i2c_dev, true); 702 702 703 703 pr_debug("adapter [%s] unregistered\n", adap->name); 704 - return 0; 704 + return NOTIFY_OK; 705 705 } 706 706 707 707 static int i2cdev_notifier_call(struct notifier_block *nb, unsigned long action, ··· 716 716 return i2cdev_detach_adapter(dev, NULL); 717 717 } 718 718 719 - return 0; 719 + return NOTIFY_DONE; 720 720 } 721 721 722 722 static struct notifier_block i2cdev_notifier = {