You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 4f1fd30b76c1bec76069483b88747783a0654f38 Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Bialonczyk <manio@skyboo.net>
|
|
Date: Sat, 25 May 2019 10:45:38 +0200
|
|
Subject: [PATCH] w1: ds2805: rename w1_family struct, fixing c-p typo
|
|
|
|
commit 0e3743d870711ae4daf1e7170c8d9381564e244d upstream.
|
|
|
|
The ds2805 has a structure named: w1_family_2d, which surely
|
|
comes from a w1_ds2431 module. This commit fixes this name to
|
|
prevent confusion and mark a correct family name.
|
|
|
|
Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/w1/slaves/w1_ds2805.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/w1/slaves/w1_ds2805.c
|
|
+++ b/drivers/w1/slaves/w1_ds2805.c
|
|
@@ -288,7 +288,7 @@ static struct w1_family_ops w1_f0d_fops
|
|
.remove_slave = w1_f0d_remove_slave,
|
|
};
|
|
|
|
-static struct w1_family w1_family_2d = {
|
|
+static struct w1_family w1_family_0d = {
|
|
.fid = W1_EEPROM_DS2805,
|
|
.fops = &w1_f0d_fops,
|
|
};
|
|
@@ -296,13 +296,13 @@ static struct w1_family w1_family_2d = {
|
|
static int __init w1_f0d_init(void)
|
|
{
|
|
pr_info("%s()\n", __func__);
|
|
- return w1_register_family(&w1_family_2d);
|
|
+ return w1_register_family(&w1_family_0d);
|
|
}
|
|
|
|
static void __exit w1_f0d_fini(void)
|
|
{
|
|
pr_info("%s()\n", __func__);
|
|
- w1_unregister_family(&w1_family_2d);
|
|
+ w1_unregister_family(&w1_family_0d);
|
|
}
|
|
|
|
module_init(w1_f0d_init);
|