Attachment #176440 for bug #252614

View | Details | Raw Unified | Return to bug 252614
Collapse All | Expand All




                             MKDEV(SVGALIB_HELPER_MAJOR, _minor),        \
                             _name);
/* 2.6.27 changed device_create to device_create_drvdata */
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
#  define SLH_SYSFS_ADD_CONTROL                                          \
     device_create_drvdata(svgalib_helper_class, NULL,                   \
                           MKDEV(SVGALIB_HELPER_MAJOR, 0),               \

                           &sh_pci_devs[_minor]->dev->dev,               \
                           MKDEV(SVGALIB_HELPER_MAJOR, _minor),          \
                           "%s%d", _name, _minor);
/* 2.6.28 changed device_create_drvdata back to device_create */
#else
#  define SLH_SYSFS_ADD_CONTROL                                         \
     device_create(svgalib_helper_class, NULL,                          \
                   MKDEV(SVGALIB_HELPER_MAJOR, 0), NULL,                \
                   "%s%d", "svga", 0);

#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                           \
     device_create(svgalib_helper_class,                                \
                   &sh_pci_devs[_minor]->dev->dev,                      \
                   MKDEV(SVGALIB_HELPER_MAJOR, _minor), NULL,           \
                   "%s%d", _name, _minor);
#endif

#  define SLH_SYSFS_REMOVE_DEVICE(i)                                    \

Return to bug 252614

Lines 128-134 Link Here

(-)svgalib-1.9.25-original/kernel/svgalib_helper/kernel26compat.h (-1 / +13 lines)
128	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \	128	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
129	_name);	129	_name);
130	/* 2.6.27 changed device_create to device_create_drvdata */	130	/* 2.6.27 changed device_create to device_create_drvdata */
131	#else	131	#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
132	# define SLH_SYSFS_ADD_CONTROL \	132	# define SLH_SYSFS_ADD_CONTROL \
133	device_create_drvdata(svgalib_helper_class, NULL, \	133	device_create_drvdata(svgalib_helper_class, NULL, \
134	MKDEV(SVGALIB_HELPER_MAJOR, 0), \	134	MKDEV(SVGALIB_HELPER_MAJOR, 0), \
Lines 139-144 Link Here
139	&sh_pci_devs[_minor]->dev->dev, \	139	&sh_pci_devs[_minor]->dev->dev, \
140	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \	140	MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
141	"%s%d", _name, _minor);	141	"%s%d", _name, _minor);
		142	/* 2.6.28 changed device_create_drvdata back to device_create */
		143	#else
		144	# define SLH_SYSFS_ADD_CONTROL \
		145	device_create(svgalib_helper_class, NULL, \
		146	MKDEV(SVGALIB_HELPER_MAJOR, 0), NULL, \
		147	"%s%d", "svga", 0);
		148
		149	# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
		150	device_create(svgalib_helper_class, \
		151	&sh_pci_devs[_minor]->dev->dev, \
		152	MKDEV(SVGALIB_HELPER_MAJOR, _minor), NULL, \
		153	"%s%d", _name, _minor);
142	#endif	154	#endif
143		155
144	# define SLH_SYSFS_REMOVE_DEVICE(i) \	156	# define SLH_SYSFS_REMOVE_DEVICE(i) \