diff options
Diffstat (limited to 'drivers/w1/w1.c')
| -rw-r--r-- | drivers/w1/w1.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index f74046c0b7..ac5fd38982 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -1,16 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net> * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include <common.h> @@ -371,7 +362,7 @@ int w1_reset_select_slave(struct w1_device *dev) #define to_w1_device(d) container_of(d, struct w1_device, dev) #define to_w1_driver(d) container_of(d, struct w1_driver, drv) -static int w1_bus_match(struct device_d *_dev, struct driver_d *_drv) +static int w1_bus_match(struct device *_dev, struct driver *_drv) { struct w1_device *dev = to_w1_device(_dev); struct w1_driver *drv = to_w1_driver(_drv); @@ -379,7 +370,7 @@ static int w1_bus_match(struct device_d *_dev, struct driver_d *_drv) return !(drv->fid == dev->fid); } -static int w1_bus_probe(struct device_d *_dev) +static int w1_bus_probe(struct device *_dev) { struct w1_driver *drv = to_w1_driver(_dev->driver); struct w1_device *dev = to_w1_device(_dev); @@ -387,7 +378,7 @@ static int w1_bus_probe(struct device_d *_dev) return drv->probe(dev); } -static void w1_bus_remove(struct device_d *_dev) +static void w1_bus_remove(struct device *_dev) { struct w1_driver *drv = to_w1_driver(_dev->driver); struct w1_device *dev = to_w1_device(_dev); @@ -405,7 +396,7 @@ struct bus_type w1_bustype= { static bool w1_is_registered(struct w1_bus *bus, u64 rn) { - struct device_d *dev = NULL; + struct device *dev = NULL; struct w1_device *w1_dev; bus_for_each_device(&w1_bustype, dev) { |