mmc: sdio: Extend sdio_config_attr macro and use it also for modalias

This simplify code for generating sdio config attributes and allows easily
define new sdio attributes.

Signed-off-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200727133837.19086-4-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Pali Rohár 2020-07-27 15:38:36 +02:00 committed by Ulf Hansson
parent 78366e9cbd
commit b91ec1dc5c

View File

@ -28,29 +28,21 @@
#define to_sdio_driver(d) container_of(d, struct sdio_driver, drv) #define to_sdio_driver(d) container_of(d, struct sdio_driver, drv)
/* show configuration fields */ /* show configuration fields */
#define sdio_config_attr(field, format_string) \ #define sdio_config_attr(field, format_string, args...) \
static ssize_t \ static ssize_t \
field##_show(struct device *dev, struct device_attribute *attr, char *buf) \ field##_show(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct sdio_func *func; \ struct sdio_func *func; \
\ \
func = dev_to_sdio_func (dev); \ func = dev_to_sdio_func (dev); \
return sprintf (buf, format_string, func->field); \ return sprintf(buf, format_string, args); \
} \ } \
static DEVICE_ATTR_RO(field) static DEVICE_ATTR_RO(field)
sdio_config_attr(class, "0x%02x\n"); sdio_config_attr(class, "0x%02x\n", func->class);
sdio_config_attr(vendor, "0x%04x\n"); sdio_config_attr(vendor, "0x%04x\n", func->vendor);
sdio_config_attr(device, "0x%04x\n"); sdio_config_attr(device, "0x%04x\n", func->device);
sdio_config_attr(modalias, "sdio:c%02Xv%04Xd%04X\n", func->class, func->vendor, func->device);
static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
{
struct sdio_func *func = dev_to_sdio_func (dev);
return sprintf(buf, "sdio:c%02Xv%04Xd%04X\n",
func->class, func->vendor, func->device);
}
static DEVICE_ATTR_RO(modalias);
static struct attribute *sdio_dev_attrs[] = { static struct attribute *sdio_dev_attrs[] = {
&dev_attr_class.attr, &dev_attr_class.attr,