Re: [PATCH 34/36] tty: add 'active' sysfs attribute to tty0 and consoledevice

[Jiri Slaby]

On 01/06/2011 11:23 PM, Greg Kroah-Hartman wrote:
> --- a/drivers/tty/tty_io.c
> +++ b/drivers/tty/tty_io.c
> @@ -3232,9 +3232,45 @@ static int __init tty_class_init(void)
>  postcore_initcall(tty_class_init);
>  
>  /* 3/2004 jmc: why do these devices exist? */
> -
>  static struct cdev tty_cdev, console_cdev;
>  
> +static ssize_t show_cons_active(struct device *dev,
> +				struct device_attribute *attr, char *buf)
> +{
> +	struct console *cs[16];
> +	int i = 0;
> +	struct console *c;
> +	ssize_t count = 0;
> +
> +	acquire_console_sem();
> +	for (c = console_drivers; c; c = c->next) {

This should be:
for_each_console(c)
like somebody already suggested.

> +		if (!c->device)
> +			continue;

Why are consoles without devices ignored here?

Other than that there are 2 build warnings, see below.

> +		if (!c->write)
> +			continue;
> +		if ((c->flags & CON_ENABLED) == 0)
> +			continue;
> +		cs[i++] = c;
> +		if (i >= ARRAY_SIZE(cs))
> +			break;
> +	}
> +	while (i--)
> +		count += sprintf(buf + count, "%s%d%c",
> +				 cs[i]->name, cs[i]->index, i ? ' ':'\n');
> +	release_console_sem();
> +
> +	return count;
> +}
> +static DEVICE_ATTR(active, S_IRUGO, show_cons_active, NULL);
> +
> +static struct device *consdev;
> +
> +void console_sysfs_notify(void)
> +{
> +	if (consdev)
> +		sysfs_notify(&consdev->kobj, NULL, "active");
> +}
> +
>  /*
>   * Ok, now we can initialize the rest of the tty devices and can count
>   * on memory allocations, interrupts etc..
> @@ -3245,15 +3281,18 @@ int __init tty_init(void)
>  	if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
>  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
>  		panic("Couldn't register /dev/tty driver\n");
> -	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,
> -			      "tty");
> +	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
>  
>  	cdev_init(&console_cdev, &console_fops);
>  	if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
>  	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
>  		panic("Couldn't register /dev/console driver\n");
> -	device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
> +	consdev = device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
>  			      "console");
> +	if (IS_ERR(consdev))
> +		consdev = NULL;
> +	else
> +		device_create_file(consdev, &dev_attr_active);

drivers/tty/tty_io.c: In function âtty_initâ:
drivers/tty/tty_io.c:3309:21: warning: ignoring return value of
âdevice_create_fileâ, declared with attribute warn_unused_result

> @@ -2967,13 +2977,24 @@ static const struct tty_operations con_ops = {
>  
>  static struct cdev vc0_cdev;
>  
> +static ssize_t show_tty_active(struct device *dev,
> +				struct device_attribute *attr, char *buf)
> +{
> +	return sprintf(buf, "tty%d\n", fg_console + 1);
> +}
> +static DEVICE_ATTR(active, S_IRUGO, show_tty_active, NULL);
> +
>  int __init vty_init(const struct file_operations *console_fops)
>  {
>  	cdev_init(&vc0_cdev, console_fops);
>  	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
>  	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
>  		panic("Couldn't register /dev/tty0 driver\n");
> -	device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
> +	tty0dev = device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
> +	if (IS_ERR(tty0dev))
> +		tty0dev = NULL;
> +	else
> +		device_create_file(tty0dev, &dev_attr_active);

drivers/tty/vt/vt.c: In function âvty_initâ:
drivers/tty/vt/vt.c:2997:21: warning: ignoring return value of
âdevice_create_fileâ, declared with attribute warn_unused_result

>  
>  	vcs_init();
>  

regards,
-- 
js
suse labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/