target/linux/brcm2708/patches-4.19/950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch

   1 From 4f1fd30b76c1bec76069483b88747783a0654f38 Mon Sep 17 00:00:00 2001
   2 From: Mariusz Bialonczyk <manio@skyboo.net>
   3 Date: Sat, 25 May 2019 10:45:38 +0200
   4 Subject: [PATCH] w1: ds2805: rename w1_family struct, fixing c-p typo
   5
   6 commit 0e3743d870711ae4daf1e7170c8d9381564e244d upstream.
   7
   8 The ds2805 has a structure named: w1_family_2d, which surely
   9 comes from a w1_ds2431 module. This commit fixes this name to
  10 prevent confusion and mark a correct family name.
  11
  12 Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net>
  13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  14 ---
  15  drivers/w1/slaves/w1_ds2805.c | 6 +++---
  16  1 file changed, 3 insertions(+), 3 deletions(-)
  17
  18 --- a/drivers/w1/slaves/w1_ds2805.c
  19 +++ b/drivers/w1/slaves/w1_ds2805.c
  20 @@ -288,7 +288,7 @@ static struct w1_family_ops w1_f0d_fops
  21         .remove_slave   = w1_f0d_remove_slave,
  22  };
  23
  24 -static struct w1_family w1_family_2d = {
  25 +static struct w1_family w1_family_0d = {
  26         .fid = W1_EEPROM_DS2805,
  27         .fops = &w1_f0d_fops,
  28  };
  29 @@ -296,13 +296,13 @@ static struct w1_family w1_family_2d = {
  30  static int __init w1_f0d_init(void)
  31  {
  32         pr_info("%s()\n", __func__);
  33 -       return w1_register_family(&w1_family_2d);
  34 +       return w1_register_family(&w1_family_0d);
  35  }
  36
  37  static void __exit w1_f0d_fini(void)
  38  {
  39         pr_info("%s()\n", __func__);
  40 -       w1_unregister_family(&w1_family_2d);
  41 +       w1_unregister_family(&w1_family_0d);
  42  }
  43
  44  module_init(w1_f0d_init);