From 1beeffe43311f64df8dd0ab08ff6b1858c58363f Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Mon, 20 Aug 2007 13:46:20 -0700 Subject: hwmon: Convert from class_device to device Convert from class_device to device for hwmon_device_register/unregister Signed-off-by: Tony Jones Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: Mark M. Hoffman --- drivers/hwmon/pc87427.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/hwmon/pc87427.c') diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c index 2915bc4ad0d5..d40509ad6ae6 100644 --- a/drivers/hwmon/pc87427.c +++ b/drivers/hwmon/pc87427.c @@ -42,7 +42,7 @@ static struct platform_device *pdev; device is using banked registers) and the register cache (needed to keep the data in the registers and the cache in sync at any time). */ struct pc87427_data { - struct class_device *class_dev; + struct device *hwmon_dev; struct mutex lock; int address[2]; const char *name; @@ -454,9 +454,9 @@ static int __devinit pc87427_probe(struct platform_device *pdev) goto exit_remove_files; } - data->class_dev = hwmon_device_register(&pdev->dev); - if (IS_ERR(data->class_dev)) { - err = PTR_ERR(data->class_dev); + data->hwmon_dev = hwmon_device_register(&pdev->dev); + if (IS_ERR(data->hwmon_dev)) { + err = PTR_ERR(data->hwmon_dev); dev_err(&pdev->dev, "Class registration failed (%d)\n", err); goto exit_remove_files; } @@ -484,7 +484,7 @@ static int __devexit pc87427_remove(struct platform_device *pdev) struct resource *res; int i; - hwmon_device_unregister(data->class_dev); + hwmon_device_unregister(data->hwmon_dev); device_remove_file(&pdev->dev, &dev_attr_name); for (i = 0; i < 8; i++) { if (!(data->fan_enabled & (1 << i))) -- cgit v1.2.3 ub'>ROSE Development and bugfix repository.Ralf Baechle
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ipv6: Use correct data types for ICMPv6 type and codeBrian Haley2009-06-231-6/+6
* net: fix xfrm reverse flow lookup for icmp6Jiri Pirko2009-01-271-2/+2
* netns xfrm: lookup in netnsAlexey Dobriyan2008-11-251-3/+3
* include/net net/ - csum_partial - remove unnecessary castsJoe Perches2008-11-191-2/+2
* net: '&' reduxAlexey Dobriyan2008-11-031-2/+2
* net: replace %p6 with %pI6Harvey Harrison2008-10-291-1/+1
* net: replace uses of NIP6_FMT with %p6Harvey Harrison2008-10-281-2/+2
* net: reduce structures when XFRM=nAlexey Dobriyan2008-10-281-1/+2
* ipv6: added net argument to ICMP6MSGIN_INC_STATS_BHDenis V. Lunev2008-10-081-1/+1
* ipv6: added net argument to ICMP6_INC_STATS_BHDenis V. Lunev2008-10-081-2/+2
* netns: add net parameter to IP6_INC_STATSDenis V. Lunev2008-10-081-1/+1
* icmp: icmp_sk() should not use smp_processor_id() in preemptible codeDenis V. Lunev2008-08-231-11/+12
* icmp: fix units for ratelimitStephen Hemminger2008-07-011-1/+2
* net: remove CVS keywordsAdrian Bunk2008-06-111-2/+0
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2008-04-141-10/+12
|\
| * [ICMP]: Ensure that ICMP relookup maintains status quoHerbert Xu2008-04-031-10/+12
* | [IPV6]: Simplify IPv6 control sockets creation.Denis V. Lunev2008-04-031-10/+6
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...David S. Miller2008-04-021-2/+2
|\|
| * [IPV6]: Fix ICMP relookup error path dst leakHerbert Xu2008-04-021-2/+2
* | [NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.YOSHIFUJI Hideaki2008-03-261-1/+1
* | [NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.YOSHIFUJI Hideaki2008-03-261-2/+2
* | [IPV6]: Optimize hop-limit determination.YOSHIFUJI Hideaki2008-03-251-6/+2
* | [NETNS][IPV6] icmp6 - make icmpv6_socket per namespaceBenjamin Thery2008-03-051-5/+8
* | [NETNS][IPV6] route6 - add netns parameter to ip6_route_outputDaniel Lezcano2008-03-051-1/+1
* | [IPV6]: Make ndisc_flow_init() common for later use.YOSHIFUJI Hideaki2008-03-041-0/+16
* | [IPV6] SYSCTL: complete initialization for sysctl table in subsystem code.YOSHIFUJI Hideaki2008-03-041-0/+4
* | ipv6: fix inet6_init/icmpv6_cleanup sections mismatchAlexey Dobriyan2008-03-031-2/+2
* | [NETNS]: Make icmpv6_sk per namespace.Denis V. Lunev2008-02-291-21/+47
* | [NETNS]: icmp(v6)_sk should not pin a namespace.Denis V. Lunev2008-02-291-6/+5
* | [ICMP]: Allocate data for __icmp(v6)_sk dynamically.Denis V. Lunev2008-02-291-5/+9
* | [ICMP]: Pass proper ICMP socket into icmp(v6)_xmit_(un)lock.Denis V. Lunev2008-02-291-12/+12
* | [ICMP]: Store sock rather than socket for ICMP flow control.Denis V. Lunev2008-02-291-12/+13
* | [INET]: Remove struct net_proto_family* from _init calls.Denis V. Lunev2008-02-291-1/+1
|/
* [ICMP]: Restore pskb_pull calls in receive functionHerbert Xu2008-02-051-1/+2
* [NETNS][IPV6]: inet6_addr - check ipv6 address per namespaceDaniel Lezcano2008-01-281-1/+1
* [NETNS][IPV6]: Make icmpv6_time sysctl per namespace.Daniel Lezcano2008-01-281-4/+2
* [NETNS][IPV6]: Make multiple instance of sysctl tables.Daniel Lezcano2008-01-281-1/+11
* [IPSEC]: Do not let packets pass when ICMP flag is offHerbert Xu2008-01-281-2/+5
* [IPSEC]: Fix reversed ICMP6 policy checkHerbert Xu2008-01-281-1/+1
* [IPSEC]: Add ICMP host relookup supportHerbert Xu2008-01-281-4/+56
* [IPv6] RAW: Compact the API for the kernelPavel Emelyanov2008-01-281-14/+1
* [IPV6]: ICMP6_MIB_OUTMSGS increment duplicatedWang Chen2008-01-21