X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch;h=0000000000000000000000000000000000000000;hb=7d7aa2fd924c27829ec25f825481554dd81bce97;hp=2f33f638c2015b013af69e6bc740fafd0e879a30;hpb=e7bfda2c243e66a75ff966ba04c28b1590b5d24c;p=openwrt%2Fopenwrt.git diff --git a/target/linux/brcm2708/patches-4.19/950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch b/target/linux/brcm2708/patches-4.19/950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch deleted file mode 100644 index 2f33f638c2..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0587-w1-ds2805-rename-w1_family-struct-fixing-c-p-typo.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4f1fd30b76c1bec76069483b88747783a0654f38 Mon Sep 17 00:00:00 2001 -From: Mariusz Bialonczyk -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 -Signed-off-by: Greg Kroah-Hartman ---- - 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);