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

Commit 7d578961 authored by David Brownell's avatar David Brownell Committed by Dominik Brodowski
Browse files

pcmcia: simplify rsrc_nonstatic attributes 



Simplify sysfs attribute registration for sockets without static
resource mappings by using an attribute_group.  This shrinks object
size a bit:  use loops in sysfs code, but have more data.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 785e821e

drivers/pcmcia/rsrc_nonstatic.c

+10 −17
Original line number Original line Diff line number Diff line
@@ -1008,41 +1008,34 @@ static ssize_t store_mem_db(struct device *dev, 
}

}

static DEVICE_ATTR(available_resources_mem, 0600, show_mem_db, store_mem_db);

static DEVICE_ATTR(available_resources_mem, 0600, show_mem_db, store_mem_db);





static struct device_attribute *pccard_rsrc_attributes[] = {

static struct attribute *pccard_rsrc_attributes[] = {

	&dev_attr_available_resources_io,

	&dev_attr_available_resources_io.attr,

	&dev_attr_available_resources_mem,

	&dev_attr_available_resources_mem.attr,

	NULL,

	NULL,

};

};





static const struct attribute_group rsrc_attributes = {

	.attrs = pccard_rsrc_attributes,

};



static int __devinit pccard_sysfs_add_rsrc(struct device *dev,

static int __devinit pccard_sysfs_add_rsrc(struct device *dev,

					   struct class_interface *class_intf)

					   struct class_interface *class_intf)

{

{

	struct pcmcia_socket *s = dev_get_drvdata(dev);

	struct pcmcia_socket *s = dev_get_drvdata(dev);

	struct device_attribute **attr;



	int ret = 0;

	if (s->resource_ops != &pccard_nonstatic_ops)

	if (s->resource_ops != &pccard_nonstatic_ops)

		return 0;

		return 0;



	return sysfs_create_group(&dev->kobj, &rsrc_attributes);

	for (attr = pccard_rsrc_attributes; *attr; attr++) {

		ret = device_create_file(dev, *attr);

		if (ret)

			break;

	}



	return ret;

}

}





static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,

static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,

					       struct class_interface *class_intf)

					       struct class_interface *class_intf)

{

{

	struct pcmcia_socket *s = dev_get_drvdata(dev);

	struct pcmcia_socket *s = dev_get_drvdata(dev);

	struct device_attribute **attr;





	if (s->resource_ops != &pccard_nonstatic_ops)

	if (s->resource_ops != &pccard_nonstatic_ops)

		return;

		return;



	sysfs_remove_group(&dev->kobj, &rsrc_attributes);

	for (attr = pccard_rsrc_attributes; *attr; attr++)

		device_remove_file(dev, *attr);

}

}





static struct class_interface pccard_rsrc_interface __refdata = {

static struct class_interface pccard_rsrc_interface __refdata = {