On 21.02.23 08:07, Ahmad Fatoum wrote:
> We have some instances of device_d and driver_d still lingering in
> documentation and commented out code. Let's drop these as well.
I see now that in the meantime some new driver_d/device_d were added.
I will change those at another time (unless Sascha wants to squash).
>
> Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
> ---
> Documentation/devel/porting.rst | 2 +-
> drivers/mtd/nand/nand_omap_gpmc.c | 2 +-
> drivers/usb/musb/musb_core.h | 2 +-
> fs/cramfs/cramfs.c | 2 +-
> include/linux/mfd/core.h | 2 +-
> include/platform_data/eth-smc911x.h | 2 +-
> include/platform_data/serial-ns16550.h | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devel/porting.rst b/Documentation/devel/porting.rst
> index 8af0456ab2d5..619c5e49e00f 100644
> --- a/Documentation/devel/porting.rst
> +++ b/Documentation/devel/porting.rst
> @@ -258,7 +258,7 @@ tree binding, you can write a driver that matches against your board's
> { /* sentinel */ },
> };
>
> - static struct driver_d my_board_driver = {
> + static struct driver my_board_driver = {
> .name = "board-mine",
> .probe = my_board_probe,
> .of_compatible = my_board_of_match,
> diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c
> index e8e690311148..c7252ce72a27 100644
> --- a/drivers/mtd/nand/nand_omap_gpmc.c
> +++ b/drivers/mtd/nand/nand_omap_gpmc.c
> @@ -12,7 +12,7 @@
> * A typical device registration is as follows:
> *
> * @code
> - * static struct device_d my_nand_device = {
> + * static struct device my_nand_device = {
> * .name = "gpmc_nand",
> * .id = some identifier you need to show.. e.g. "gpmc_nand0"
> * .resource[0].start = GPMC base address
> diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
> index a0467ff3c465..c9a0a8eed662 100644
> --- a/drivers/usb/musb/musb_core.h
> +++ b/drivers/usb/musb/musb_core.h
> @@ -324,7 +324,7 @@ struct musb {
> u16 int_rx;
> u16 int_tx;
>
> - //struct device_d *phydev;
> + //struct device *phydev;
> struct usb_host host;
> struct usb_phy *xceiv;
>
> diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
> index 4676af8a5515..2d1070f1a7e2 100644
> --- a/fs/cramfs/cramfs.c
> +++ b/fs/cramfs/cramfs.c
> @@ -168,7 +168,7 @@ static int cramfs_read(struct device *_dev, FILE *f, void *buf, size_t size)
> }
>
> #if 0
> -static int cramfs_info (struct device_d *dev)
> +static int cramfs_info (struct device *dev)
> {
> if (cramfs_read_super (dev))
> return 0;
> diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
> index 5175bbe3709a..18ff16a64231 100644
> --- a/include/linux/mfd/core.h
> +++ b/include/linux/mfd/core.h
> @@ -12,7 +12,7 @@ struct device;
> /*
> * This struct describes the MFD part ("cell").
> * After registration the copy of this structure will become the platform data
> - * of the resulting device_d
> + * of the resulting device
> */
> struct mfd_cell {
> const char *name;
> diff --git a/include/platform_data/eth-smc911x.h b/include/platform_data/eth-smc911x.h
> index c97a2967c90e..77b4f44633d1 100644
> --- a/include/platform_data/eth-smc911x.h
> +++ b/include/platform_data/eth-smc911x.h
> @@ -9,7 +9,7 @@
>
> /**
> * @brief Platform dependent feature:
> - * Pass pointer to this structure as part of device_d -> platform_data
> + * Pass pointer to this structure as part of device -> platform_data
> */
> struct smc911x_plat {
> u32 shift;
> diff --git a/include/platform_data/serial-ns16550.h b/include/platform_data/serial-ns16550.h
> index ccf950b077a3..11a5e9c7a3ea 100644
> --- a/include/platform_data/serial-ns16550.h
> +++ b/include/platform_data/serial-ns16550.h
> @@ -28,7 +28,7 @@
>
> /**
> * @brief Platform dependent feature:
> - * Pass pointer to this structure as part of device_d -> platform_data
> + * Pass pointer to this structure as part of device -> platform_data
> */
> struct NS16550_plat {
> /** Clock speed */
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
