Skip to content

L
linux
Commit 78cde088 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Driver core: convert fb code to use struct device 

Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e55c8790
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 84 deletions
drivers/video/fbmem.c
View file @ 78cde088
...@@ -1296,14 +1296,14 @@ register_framebuffer(struct fb_info *fb_info) ...@@ -1296,14 +1296,14 @@ register_framebuffer(struct fb_info *fb_info)
break; break;
fb_info->node = i; fb_info->node = i;
fb_info->class_device = class_device_create(fb_class, NULL, MKDEV(FB_MAJOR, i), fb_info->dev = device_create(fb_class, fb_info->device,
fb_info->device, "fb%d", i); MKDEV(FB_MAJOR, i), "fb%d", i);
if (IS_ERR(fb_info->class_device)) { if (IS_ERR(fb_info->dev)) {
/* Not fatal */ /* Not fatal */
printk(KERN_WARNING "Unable to create class_device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->class_device)); printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
fb_info->class_device = NULL; fb_info->dev = NULL;
} else } else
fb_init_class_device(fb_info); fb_init_device(fb_info);
if (fb_info->pixmap.addr == NULL) { if (fb_info->pixmap.addr == NULL) {
fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL); fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
...@@ -1356,8 +1356,8 @@ unregister_framebuffer(struct fb_info *fb_info) ...@@ -1356,8 +1356,8 @@ unregister_framebuffer(struct fb_info *fb_info)
fb_destroy_modelist(&fb_info->modelist); fb_destroy_modelist(&fb_info->modelist);
registered_fb[i]=NULL; registered_fb[i]=NULL;
num_registered_fb--; num_registered_fb--;
fb_cleanup_class_device(fb_info); fb_cleanup_device(fb_info);
class_device_destroy(fb_class, MKDEV(FB_MAJOR, i)); device_destroy(fb_class, MKDEV(FB_MAJOR, i));
event.info = fb_info; event.info = fb_info;
fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event); fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
return 0; return 0;
......
drivers/video/fbsysfs.c
View file @ 78cde088
...@@ -73,7 +73,7 @@ EXPORT_SYMBOL(framebuffer_alloc); ...@@ -73,7 +73,7 @@ EXPORT_SYMBOL(framebuffer_alloc);
* *
* @info: frame buffer info structure * @info: frame buffer info structure
* *
* Drop the reference count of the class_device embedded in the * Drop the reference count of the device embedded in the
* framebuffer info structure. * framebuffer info structure.
* *
*/ */
...@@ -120,10 +120,10 @@ static int mode_string(char *buf, unsigned int offset, ...@@ -120,10 +120,10 @@ static int mode_string(char *buf, unsigned int offset,
m, mode->xres, mode->yres, v, mode->refresh); m, mode->xres, mode->yres, v, mode->refresh);
} }
static ssize_t store_mode(struct class_device *class_device, const char * buf, static ssize_t store_mode(struct device *device, struct device_attribute *attr,
size_t count) const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
char mstr[100]; char mstr[100];
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
struct fb_modelist *modelist; struct fb_modelist *modelist;
...@@ -151,9 +151,10 @@ static ssize_t store_mode(struct class_device *class_device, const char * buf, ...@@ -151,9 +151,10 @@ static ssize_t store_mode(struct class_device *class_device, const char * buf,
return -EINVAL; return -EINVAL;
} }
static ssize_t show_mode(struct class_device *class_device, char *buf) static ssize_t show_mode(struct device *device, struct device_attribute *attr,
char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
if (!fb_info->mode) if (!fb_info->mode)
return 0; return 0;
...@@ -161,10 +162,11 @@ static ssize_t show_mode(struct class_device *class_device, char *buf) ...@@ -161,10 +162,11 @@ static ssize_t show_mode(struct class_device *class_device, char *buf)
return mode_string(buf, 0, fb_info->mode); return mode_string(buf, 0, fb_info->mode);
} }
static ssize_t store_modes(struct class_device *class_device, const char * buf, static ssize_t store_modes(struct device *device,
size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
LIST_HEAD(old_list); LIST_HEAD(old_list);
int i = count / sizeof(struct fb_videomode); int i = count / sizeof(struct fb_videomode);
...@@ -186,9 +188,10 @@ static ssize_t store_modes(struct class_device *class_device, const char * buf, ...@@ -186,9 +188,10 @@ static ssize_t store_modes(struct class_device *class_device, const char * buf,
return 0; return 0;
} }
static ssize_t show_modes(struct class_device *class_device, char *buf) static ssize_t show_modes(struct device *device, struct device_attribute *attr,
char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
unsigned int i; unsigned int i;
struct list_head *pos; struct list_head *pos;
struct fb_modelist *modelist; struct fb_modelist *modelist;
...@@ -203,10 +206,10 @@ static ssize_t show_modes(struct class_device *class_device, char *buf) ...@@ -203,10 +206,10 @@ static ssize_t show_modes(struct class_device *class_device, char *buf)
return i; return i;
} }
static ssize_t store_bpp(struct class_device *class_device, const char * buf, static ssize_t store_bpp(struct device *device, struct device_attribute *attr,
size_t count) const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
char ** last = NULL; char ** last = NULL;
int err; int err;
...@@ -218,16 +221,18 @@ static ssize_t store_bpp(struct class_device *class_device, const char * buf, ...@@ -218,16 +221,18 @@ static ssize_t store_bpp(struct class_device *class_device, const char * buf,
return count; return count;
} }
static ssize_t show_bpp(struct class_device *class_device, char *buf) static ssize_t show_bpp(struct device *device, struct device_attribute *attr,
char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.bits_per_pixel); return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.bits_per_pixel);
} }
static ssize_t store_rotate(struct class_device *class_device, const char *buf, static ssize_t store_rotate(struct device *device,
size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
char **last = NULL; char **last = NULL;
int err; int err;
...@@ -242,17 +247,19 @@ static ssize_t store_rotate(struct class_device *class_device, const char *buf, ...@@ -242,17 +247,19 @@ static ssize_t store_rotate(struct class_device *class_device, const char *buf,
} }
static ssize_t show_rotate(struct class_device *class_device, char *buf) static ssize_t show_rotate(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate); return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate);
} }
static ssize_t store_virtual(struct class_device *class_device, static ssize_t store_virtual(struct device *device,
const char * buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
char *last = NULL; char *last = NULL;
int err; int err;
...@@ -269,23 +276,26 @@ static ssize_t store_virtual(struct class_device *class_device, ...@@ -269,23 +276,26 @@ static ssize_t store_virtual(struct class_device *class_device,
return count; return count;
} }
static ssize_t show_virtual(struct class_device *class_device, char *buf) static ssize_t show_virtual(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual, return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
fb_info->var.yres_virtual); fb_info->var.yres_virtual);
} }
static ssize_t show_stride(struct class_device *class_device, char *buf) static ssize_t show_stride(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length); return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
} }
static ssize_t store_blank(struct class_device *class_device, const char * buf, static ssize_t store_blank(struct device *device,
size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
char *last = NULL; char *last = NULL;
int err; int err;
...@@ -299,42 +309,48 @@ static ssize_t store_blank(struct class_device *class_device, const char * buf, ...@@ -299,42 +309,48 @@ static ssize_t store_blank(struct class_device *class_device, const char * buf,
return count; return count;
} }
static ssize_t show_blank(struct class_device *class_device, char *buf) static ssize_t show_blank(struct device *device,
struct device_attribute *attr, char *buf)
{ {
// struct fb_info *fb_info = class_get_devdata(class_device); // struct fb_info *fb_info = dev_get_drvdata(device);
return 0; return 0;
} }
static ssize_t store_console(struct class_device *class_device, static ssize_t store_console(struct device *device,
const char * buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
// struct fb_info *fb_info = class_get_devdata(class_device); // struct fb_info *fb_info = dev_get_drvdata(device);
return 0; return 0;
} }
static ssize_t show_console(struct class_device *class_device, char *buf) static ssize_t show_console(struct device *device,
struct device_attribute *attr, char *buf)
{ {
// struct fb_info *fb_info = class_get_devdata(class_device); // struct fb_info *fb_info = dev_get_drvdata(device);
return 0; return 0;
} }
static ssize_t store_cursor(struct class_device *class_device, static ssize_t store_cursor(struct device *device,
const char * buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
// struct fb_info *fb_info = class_get_devdata(class_device); // struct fb_info *fb_info = dev_get_drvdata(device);
return 0; return 0;
} }
static ssize_t show_cursor(struct class_device *class_device, char *buf) static ssize_t show_cursor(struct device *device,
struct device_attribute *attr, char *buf)
{ {
// struct fb_info *fb_info = class_get_devdata(class_device); // struct fb_info *fb_info = dev_get_drvdata(device);
return 0; return 0;
} }
static ssize_t store_pan(struct class_device *class_device, const char * buf, static ssize_t store_pan(struct device *device,
size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
char *last = NULL; char *last = NULL;
int err; int err;
...@@ -355,24 +371,27 @@ static ssize_t store_pan(struct class_device *class_device, const char * buf, ...@@ -355,24 +371,27 @@ static ssize_t store_pan(struct class_device *class_device, const char * buf,
return count; return count;
} }
static ssize_t show_pan(struct class_device *class_device, char *buf) static ssize_t show_pan(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset, return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset,
fb_info->var.xoffset); fb_info->var.xoffset);
} }
static ssize_t show_name(struct class_device *class_device, char *buf) static ssize_t show_name(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%s\n", fb_info->fix.id); return snprintf(buf, PAGE_SIZE, "%s\n", fb_info->fix.id);
} }
static ssize_t store_fbstate(struct class_device *class_device, static ssize_t store_fbstate(struct device *device,
struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
u32 state; u32 state;
char *last = NULL; char *last = NULL;
...@@ -385,17 +404,19 @@ static ssize_t store_fbstate(struct class_device *class_device, ...@@ -385,17 +404,19 @@ static ssize_t store_fbstate(struct class_device *class_device,
return count; return count;
} }
static ssize_t show_fbstate(struct class_device *class_device, char *buf) static ssize_t show_fbstate(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state); return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
} }
#ifdef CONFIG_FB_BACKLIGHT #ifdef CONFIG_FB_BACKLIGHT
static ssize_t store_bl_curve(struct class_device *class_device, static ssize_t store_bl_curve(struct device *device,
struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
u8 tmp_curve[FB_BACKLIGHT_LEVELS]; u8 tmp_curve[FB_BACKLIGHT_LEVELS];
unsigned int i; unsigned int i;
...@@ -432,9 +453,10 @@ static ssize_t store_bl_curve(struct class_device *class_device, ...@@ -432,9 +453,10 @@ static ssize_t store_bl_curve(struct class_device *class_device,
return count; return count;
} }
static ssize_t show_bl_curve(struct class_device *class_device, char *buf) static ssize_t show_bl_curve(struct device *device,
struct device_attribute *attr, char *buf)
{ {
struct fb_info *fb_info = class_get_devdata(class_device); struct fb_info *fb_info = dev_get_drvdata(device);
ssize_t len = 0; ssize_t len = 0;
unsigned int i; unsigned int i;
...@@ -465,7 +487,7 @@ static ssize_t show_bl_curve(struct class_device *class_device, char *buf) ...@@ -465,7 +487,7 @@ static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
/* When cmap is added back in it should be a binary attribute /* When cmap is added back in it should be a binary attribute
* not a text one. Consideration should also be given to converting * not a text one. Consideration should also be given to converting
* fbdev to use configfs instead of sysfs */ * fbdev to use configfs instead of sysfs */
static struct class_device_attribute class_device_attrs[] = { static struct device_attribute device_attrs[] = {
__ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp), __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
__ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank), __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
__ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console), __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
...@@ -483,17 +505,16 @@ static struct class_device_attribute class_device_attrs[] = { ...@@ -483,17 +505,16 @@ static struct class_device_attribute class_device_attrs[] = {
#endif #endif
}; };
int fb_init_class_device(struct fb_info *fb_info) int fb_init_device(struct fb_info *fb_info)
{ {
int i, error = 0; int i, error = 0;
class_set_devdata(fb_info->class_device, fb_info); dev_set_drvdata(fb_info->dev, fb_info);
fb_info->class_flag |= FB_SYSFS_FLAG_ATTR; fb_info->class_flag |= FB_SYSFS_FLAG_ATTR;
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) { for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
error = class_device_create_file(fb_info->class_device, error = device_create_file(fb_info->dev, &device_attrs[i]);
&class_device_attrs[i]);
if (error) if (error)
break; break;
...@@ -501,22 +522,20 @@ int fb_init_class_device(struct fb_info *fb_info) ...@@ -501,22 +522,20 @@ int fb_init_class_device(struct fb_info *fb_info)
if (error) { if (error) {
while (--i >= 0) while (--i >= 0)
class_device_remove_file(fb_info->class_device, device_remove_file(fb_info->dev, &device_attrs[i]);
&class_device_attrs[i]);
fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR; fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
} }
return 0; return 0;
} }
void fb_cleanup_class_device(struct fb_info *fb_info) void fb_cleanup_device(struct fb_info *fb_info)
{ {
unsigned int i; unsigned int i;
if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) { if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) {
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
class_device_remove_file(fb_info->class_device, device_remove_file(fb_info->dev, &device_attrs[i]);
&class_device_attrs[i]);
fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR; fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
} }
......
include/linux/fb.h
View file @ 78cde088
...@@ -774,8 +774,8 @@ struct fb_info { ...@@ -774,8 +774,8 @@ struct fb_info {
#endif #endif
struct fb_ops *fbops; struct fb_ops *fbops;
struct device *device; struct device *device; /* This is the parent */
struct class_device *class_device; /* sysfs per device attrs */ struct device *dev; /* This is this fb device */
int class_flag; /* private sysfs flags */ int class_flag; /* private sysfs flags */
#ifdef CONFIG_FB_TILEBLITTING #ifdef CONFIG_FB_TILEBLITTING
struct fb_tile_ops *tileops; /* Tile Blitting */ struct fb_tile_ops *tileops; /* Tile Blitting */
...@@ -910,8 +910,8 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, ...@@ -910,8 +910,8 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
/* drivers/video/fbsysfs.c */ /* drivers/video/fbsysfs.c */
extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev); extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
extern void framebuffer_release(struct fb_info *info); extern void framebuffer_release(struct fb_info *info);
extern int fb_init_class_device(struct fb_info *fb_info); extern int fb_init_device(struct fb_info *fb_info);
extern void fb_cleanup_class_device(struct fb_info *head); extern void fb_cleanup_device(struct fb_info *head);
extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max); extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max);
/* drivers/video/fbmon.c */ /* drivers/video/fbmon.c */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7