Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb3fed79 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ide: convert bus code to use dev_groups 



The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the ide bus code to use the
correct field.

Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: <linux-ide@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00173146

drivers/ide/ide-sysfs.c

+26 −9
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ static ssize_t media_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "%s\n", ide_media_string(drive));

}

static DEVICE_ATTR_RO(media);



static ssize_t drivename_show(struct device *dev, struct device_attribute *attr,

			      char *buf)
@@ -32,6 +33,7 @@ static ssize_t drivename_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "%s\n", drive->name);

}

static DEVICE_ATTR_RO(drivename);



static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,

			     char *buf)
@@ -39,6 +41,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "ide:m-%s\n", ide_media_string(drive));

}

static DEVICE_ATTR_RO(modalias);



static ssize_t model_show(struct device *dev, struct device_attribute *attr,

			  char *buf)
@@ -46,6 +49,7 @@ static ssize_t model_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "%s\n", (char *)&drive->id[ATA_ID_PROD]);

}

static DEVICE_ATTR_RO(model);



static ssize_t firmware_show(struct device *dev, struct device_attribute *attr,

			     char *buf)
@@ -53,6 +57,7 @@ static ssize_t firmware_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "%s\n", (char *)&drive->id[ATA_ID_FW_REV]);

}

static DEVICE_ATTR_RO(firmware);



static ssize_t serial_show(struct device *dev, struct device_attribute *attr,

			   char *buf)
@@ -60,16 +65,28 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr, 
	ide_drive_t *drive = to_ide_device(dev);

	return sprintf(buf, "%s\n", (char *)&drive->id[ATA_ID_SERNO]);

}

static DEVICE_ATTR(serial, 0400, serial_show, NULL);



static DEVICE_ATTR(unload_heads, 0644, ide_park_show, ide_park_store);



static struct attribute *ide_attrs[] = {

	&dev_attr_media.attr,

	&dev_attr_drivename.attr,

	&dev_attr_modalias.attr,

	&dev_attr_model.attr,

	&dev_attr_firmware.attr,

	&dev_attr_serial.attr,

	&dev_attr_unload_heads.attr,

	NULL,

};



static const struct attribute_group ide_attr_group = {

	.attrs = ide_attrs,

};



struct device_attribute ide_dev_attrs[] = {

	__ATTR_RO(media),

	__ATTR_RO(drivename),

	__ATTR_RO(modalias),

	__ATTR_RO(model),

	__ATTR_RO(firmware),

	__ATTR(serial, 0400, serial_show, NULL),

	__ATTR(unload_heads, 0644, ide_park_show, ide_park_store),

	__ATTR_NULL

const struct attribute_group *ide_dev_groups[] = {

	&ide_attr_group,

	NULL,

};



static ssize_t store_delete_devices(struct device *portdev,

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct bus_type ide_bus_type = { 
	.probe		= generic_ide_probe,

	.remove		= generic_ide_remove,

	.shutdown	= generic_ide_shutdown,

	.dev_attrs	= ide_dev_attrs,

	.dev_groups	= ide_dev_groups,

	.suspend	= generic_ide_suspend,

	.resume		= generic_ide_resume,

};

include/linux/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -1514,7 +1514,7 @@ static inline void ide_set_max_pio(ide_drive_t *drive) 


char *ide_media_string(ide_drive_t *);



extern struct device_attribute ide_dev_attrs[];

extern const struct attribute_group *ide_dev_groups[];

extern struct bus_type ide_bus_type;

extern struct class *ide_port_class;