diff options
Diffstat (limited to 'drivers/w1/w1.h')
| -rw-r--r-- | drivers/w1/w1.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h index b92d8cdb95..f268e42545 100644 --- a/drivers/w1/w1.h +++ b/drivers/w1/w1.h @@ -1,18 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * w1.h * * 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. */ #ifndef __W1_H @@ -28,7 +19,7 @@ struct w1_device { u8 crc; struct w1_bus *bus; - struct device_d dev; + struct device dev; }; struct w1_driver { @@ -37,7 +28,7 @@ struct w1_driver { int (*probe) (struct w1_device *dev); void (*remove) (struct w1_device *dev); - struct driver_d drv; + struct driver drv; }; int w1_driver_register(struct w1_driver *drv); @@ -67,8 +58,8 @@ extern struct bus_type w1_bustype; */ struct w1_bus { - struct device_d dev; - struct device_d *parent; + struct device dev; + struct device *parent; /** * Sample the line level |