(capi_get_serial): Renamed to capi_get_serial_number().
(show_serial): Renamed to show_serial_number(). sprintf() replaced by snprintf().
This commit is contained in:
parent
edaece7ce0
commit
30de819091
|
@ -355,7 +355,7 @@ capi_get_manufacturer(int id, u8 manufacturer[CAPI_MANUFACTURER_LEN])
|
|||
|
||||
|
||||
u8*
|
||||
capi_get_serial(int id, u8 serial[CAPI_SERIAL_LEN])
|
||||
capi_get_serial_number(int id, u8 serial[CAPI_SERIAL_LEN])
|
||||
{
|
||||
if (id) {
|
||||
struct capi_device* dev = try_get_capi_device_by_id(id);
|
||||
|
@ -440,6 +440,6 @@ EXPORT_SYMBOL(capi_get_message);
|
|||
EXPORT_SYMBOL(capi_peek_message);
|
||||
EXPORT_SYMBOL(capi_isinstalled);
|
||||
EXPORT_SYMBOL(capi_get_manufacturer);
|
||||
EXPORT_SYMBOL(capi_get_serial);
|
||||
EXPORT_SYMBOL(capi_get_serial_number);
|
||||
EXPORT_SYMBOL(capi_get_version);
|
||||
EXPORT_SYMBOL(capi_get_profile);
|
||||
|
|
|
@ -35,11 +35,11 @@ CLASS_DEVICE_ATTR(manufacturer, S_IRUGO, show_manufacturer, NULL);
|
|||
|
||||
|
||||
static ssize_t
|
||||
show_serial(struct class_device* cd, char* buf)
|
||||
show_serial_number(struct class_device* cd, char* buf)
|
||||
{
|
||||
return sprintf(buf, "%s", to_capi_device(cd)->serial);
|
||||
return snprintf(buf, CAPI_SERIAL_LEN, "%s", to_capi_device(cd)->serial);
|
||||
}
|
||||
CLASS_DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
|
||||
CLASS_DEVICE_ATTR(serial_number, S_IRUGO, show_serial_number, NULL);
|
||||
|
||||
|
||||
static ssize_t
|
||||
|
@ -54,7 +54,7 @@ CLASS_DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
|
|||
|
||||
static struct class_device_attribute* attrs[] = {
|
||||
&class_device_attr_manufacturer,
|
||||
&class_device_attr_serial,
|
||||
&class_device_attr_serial_number,
|
||||
&class_device_attr_version,
|
||||
NULL
|
||||
};
|
||||
|
|
|
@ -138,7 +138,7 @@ capinfo_0x11 capi_peek_message (struct capi_appl* appl);
|
|||
capinfo_0x11 capi_isinstalled (void);
|
||||
|
||||
struct capi_version* capi_get_version (int dev, struct capi_version* version);
|
||||
u8* capi_get_serial (int dev, u8 serial[CAPI_SERIAL_LEN]);
|
||||
u8* capi_get_serial_number (int dev, u8 serial[CAPI_SERIAL_LEN]);
|
||||
capinfo_0x11 capi_get_profile (int dev, struct capi_profile* profile);
|
||||
u8* capi_get_manufacturer (int dev, u8 manufacturer[CAPI_MANUFACTURER_LEN]);
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
Loading…
Reference in New Issue