adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] Driver Core: drivers/base - drivers/i2c/chips/adm1026.c: update device attribute callbacks

Browse source 
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Yani Ioannou 2005-05-17 06:41:12 -04:00 committed by Greg Kroah-Hartman
parent ff381d2223
commit 74880c063b
12 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/base/dmapool.c
View file

@ -41,7 +41,7 @@ struct dma_page { /* cacheable header for 'allocation' bytes */
static DECLARE_MUTEX (pools_lock); static DECLARE_MUTEX (pools_lock);
static ssize_t static ssize_t
show_pools (struct device *dev, char *buf) show_pools (struct device *dev, struct device_attribute *attr, char *buf)
{ {
unsigned temp; unsigned temp;
unsigned size; unsigned size;

4
drivers/base/power/sysfs.c
View file

@ -24,12 +24,12 @@
* low-power state. * low-power state.
*/ */
static ssize_t state_show(struct device * dev, char * buf) static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
{ {
return sprintf(buf, "%u\n", dev->power.power_state); return sprintf(buf, "%u\n", dev->power.power_state);
} }
static ssize_t state_store(struct device * dev, const char * buf, size_t n) static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
{ {
u32 state; u32 state;
char * rest; char * rest;

2
drivers/block/ub.c
View file

@ -430,7 +430,7 @@ static void ub_cmdtr_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
} }
} }
static ssize_t ub_diag_show(struct device *dev, char *page) static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr, char *page)
{ {
struct usb_interface *intf; struct usb_interface *intf;
struct ub_dev *sc; struct ub_dev *sc;

14
drivers/char/hvcs.c
View file

@ -1466,7 +1466,7 @@ static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod)
} }
/* The sysfs interface for the driver and devices */ /* The sysfs interface for the driver and devices */
static ssize_t hvcs_partner_vtys_show(struct device *dev, char *buf) static ssize_t hvcs_partner_vtys_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
struct hvcs_struct *hvcsd = from_vio_dev(viod); struct hvcs_struct *hvcsd = from_vio_dev(viod);
@ -1480,7 +1480,7 @@ static ssize_t hvcs_partner_vtys_show(struct device *dev, char *buf)
} }
static DEVICE_ATTR(partner_vtys, S_IRUGO, hvcs_partner_vtys_show, NULL); static DEVICE_ATTR(partner_vtys, S_IRUGO, hvcs_partner_vtys_show, NULL);
static ssize_t hvcs_partner_clcs_show(struct device *dev, char *buf) static ssize_t hvcs_partner_clcs_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
struct hvcs_struct *hvcsd = from_vio_dev(viod); struct hvcs_struct *hvcsd = from_vio_dev(viod);
@ -1494,7 +1494,7 @@ static ssize_t hvcs_partner_clcs_show(struct device *dev, char *buf)
} }
static DEVICE_ATTR(partner_clcs, S_IRUGO, hvcs_partner_clcs_show, NULL); static DEVICE_ATTR(partner_clcs, S_IRUGO, hvcs_partner_clcs_show, NULL);
static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf, static ssize_t hvcs_current_vty_store(struct device *dev, struct device_attribute *attr, const char * buf,
size_t count) size_t count)
{ {
/* /*
@ -1505,7 +1505,7 @@ static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf,
return -EPERM; return -EPERM;
} }
static ssize_t hvcs_current_vty_show(struct device *dev, char *buf) static ssize_t hvcs_current_vty_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
struct hvcs_struct *hvcsd = from_vio_dev(viod); struct hvcs_struct *hvcsd = from_vio_dev(viod);
@ -1521,7 +1521,7 @@ static ssize_t hvcs_current_vty_show(struct device *dev, char *buf)
static DEVICE_ATTR(current_vty, static DEVICE_ATTR(current_vty,
S_IRUGO | S_IWUSR, hvcs_current_vty_show, hvcs_current_vty_store); S_IRUGO | S_IWUSR, hvcs_current_vty_show, hvcs_current_vty_store);
static ssize_t hvcs_vterm_state_store(struct device *dev, const char *buf, static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
@ -1559,7 +1559,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, const char *buf,
return count; return count;
} }
static ssize_t hvcs_vterm_state_show(struct device *dev, char *buf) static ssize_t hvcs_vterm_state_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
struct hvcs_struct *hvcsd = from_vio_dev(viod); struct hvcs_struct *hvcsd = from_vio_dev(viod);
@ -1574,7 +1574,7 @@ static ssize_t hvcs_vterm_state_show(struct device *dev, char *buf)
static DEVICE_ATTR(vterm_state, S_IRUGO | S_IWUSR, static DEVICE_ATTR(vterm_state, S_IRUGO | S_IWUSR,
hvcs_vterm_state_show, hvcs_vterm_state_store); hvcs_vterm_state_show, hvcs_vterm_state_store);
static ssize_t hvcs_index_show(struct device *dev, char *buf) static ssize_t hvcs_index_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct vio_dev *viod = to_vio_dev(dev); struct vio_dev *viod = to_vio_dev(dev);
struct hvcs_struct *hvcsd = from_vio_dev(viod); struct hvcs_struct *hvcsd = from_vio_dev(viod);

4
drivers/char/mbcs.c
View file

@ -699,7 +699,7 @@ static inline int mbcs_hw_init(struct mbcs_soft *soft)
return 0; return 0;
} }
static ssize_t show_algo(struct device *dev, char *buf) static ssize_t show_algo(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct cx_dev *cx_dev = to_cx_dev(dev); struct cx_dev *cx_dev = to_cx_dev(dev);
struct mbcs_soft *soft = cx_dev->soft; struct mbcs_soft *soft = cx_dev->soft;
@ -715,7 +715,7 @@ static ssize_t show_algo(struct device *dev, char *buf)
(debug0 >> 32), (debug0 & 0xffffffff)); (debug0 >> 32), (debug0 & 0xffffffff));
} }
static ssize_t store_algo(struct device *dev, const char *buf, size_t count) static ssize_t store_algo(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
int n; int n;
struct cx_dev *cx_dev = to_cx_dev(dev); struct cx_dev *cx_dev = to_cx_dev(dev);

2
drivers/char/mwave/mwavedd.c
View file

@ -472,7 +472,7 @@ struct device mwave_device;
/* Prevent code redundancy, create a macro for mwave_show_* functions. */ /* Prevent code redundancy, create a macro for mwave_show_* functions. */
#define mwave_show_function(attr_name, format_string, field) \ #define mwave_show_function(attr_name, format_string, field) \
static ssize_t mwave_show_##attr_name(struct device *dev, char *buf) \ static ssize_t mwave_show_##attr_name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
DSP_3780I_CONFIG_SETTINGS *pSettings = \ DSP_3780I_CONFIG_SETTINGS *pSettings = \
&mwave_s_mdd.rBDData.rDspSettings; \ &mwave_s_mdd.rBDData.rDspSettings; \

6
drivers/char/tpm/tpm.c
View file

@ -212,7 +212,7 @@ static u8 pcrread[] = {
0, 0, 0, 0 /* PCR index */ 0, 0, 0, 0 /* PCR index */
}; };
static ssize_t show_pcrs(struct device *dev, char *buf) static ssize_t show_pcrs(struct device *dev, struct device_attribute *attr, char *buf)
{ {
u8 data[READ_PCR_RESULT_SIZE]; u8 data[READ_PCR_RESULT_SIZE];
ssize_t len; ssize_t len;
@ -255,7 +255,7 @@ static u8 readpubek[] = {
0, 0, 0, 124, /* TPM_ORD_ReadPubek */ 0, 0, 0, 124, /* TPM_ORD_ReadPubek */
}; };
static ssize_t show_pubek(struct device *dev, char *buf) static ssize_t show_pubek(struct device *dev, struct device_attribute *attr, char *buf)
{ {
u8 data[READ_PUBEK_RESULT_SIZE]; u8 data[READ_PUBEK_RESULT_SIZE];
ssize_t len; ssize_t len;
@ -330,7 +330,7 @@ static u8 cap_manufacturer[] = {
0, 0, 1, 3 0, 0, 1, 3
}; };
static ssize_t show_caps(struct device *dev, char *buf) static ssize_t show_caps(struct device *dev, struct device_attribute *attr, char *buf)
{ {
u8 data[READ_PUBEK_RESULT_SIZE]; u8 data[READ_PUBEK_RESULT_SIZE];
ssize_t len; ssize_t len;

10
drivers/dio/dio-sysfs.c
View file

@ -17,7 +17,7 @@
/* show configuration fields */ /* show configuration fields */
static ssize_t dio_show_id(struct device *dev, char *buf) static ssize_t dio_show_id(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dio_dev *d; struct dio_dev *d;
@ -26,7 +26,7 @@ static ssize_t dio_show_id(struct device *dev, char *buf)
} }
static DEVICE_ATTR(id, S_IRUGO, dio_show_id, NULL); static DEVICE_ATTR(id, S_IRUGO, dio_show_id, NULL);
static ssize_t dio_show_ipl(struct device *dev, char *buf) static ssize_t dio_show_ipl(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dio_dev *d; struct dio_dev *d;
@ -35,7 +35,7 @@ static ssize_t dio_show_ipl(struct device *dev, char *buf)
} }
static DEVICE_ATTR(ipl, S_IRUGO, dio_show_ipl, NULL); static DEVICE_ATTR(ipl, S_IRUGO, dio_show_ipl, NULL);
static ssize_t dio_show_secid(struct device *dev, char *buf) static ssize_t dio_show_secid(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dio_dev *d; struct dio_dev *d;
@ -44,7 +44,7 @@ static ssize_t dio_show_secid(struct device *dev, char *buf)
} }
static DEVICE_ATTR(secid, S_IRUGO, dio_show_secid, NULL); static DEVICE_ATTR(secid, S_IRUGO, dio_show_secid, NULL);
static ssize_t dio_show_name(struct device *dev, char *buf) static ssize_t dio_show_name(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dio_dev *d; struct dio_dev *d;
@ -53,7 +53,7 @@ static ssize_t dio_show_name(struct device *dev, char *buf)
} }
static DEVICE_ATTR(name, S_IRUGO, dio_show_name, NULL); static DEVICE_ATTR(name, S_IRUGO, dio_show_name, NULL);
static ssize_t dio_show_resource(struct device *dev, char *buf) static ssize_t dio_show_resource(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dio_dev *d = to_dio_dev(dev); struct dio_dev *d = to_dio_dev(dev);

4
drivers/eisa/eisa-bus.c
View file

@ -149,7 +149,7 @@ void eisa_driver_unregister (struct eisa_driver *edrv)
driver_unregister (&edrv->driver); driver_unregister (&edrv->driver);
} }
static ssize_t eisa_show_sig (struct device *dev, char *buf) static ssize_t eisa_show_sig (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct eisa_device *edev = to_eisa_device (dev); struct eisa_device *edev = to_eisa_device (dev);
return sprintf (buf,"%s\n", edev->id.sig); return sprintf (buf,"%s\n", edev->id.sig);
@ -157,7 +157,7 @@ static ssize_t eisa_show_sig (struct device *dev, char *buf)
static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL); static DEVICE_ATTR(signature, S_IRUGO, eisa_show_sig, NULL);
static ssize_t eisa_show_state (struct device *dev, char *buf) static ssize_t eisa_show_state (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct eisa_device *edev = to_eisa_device (dev); struct eisa_device *edev = to_eisa_device (dev);
return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED); return sprintf (buf,"%d\n", edev->state & EISA_CONFIG_ENABLED);

6
drivers/i2c/chips/adm1021.c
View file

@ -137,7 +137,7 @@ static struct i2c_driver adm1021_driver = {
}; };
#define show(value) \ #define show(value) \
static ssize_t show_##value(struct device *dev, char *buf) \ static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1021_data *data = adm1021_update_device(dev); \ struct adm1021_data *data = adm1021_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@ -150,7 +150,7 @@ show(remote_temp_hyst);
show(remote_temp_input); show(remote_temp_input);
#define show2(value) \ #define show2(value) \
static ssize_t show_##value(struct device *dev, char *buf) \ static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1021_data *data = adm1021_update_device(dev); \ struct adm1021_data *data = adm1021_update_device(dev); \
return sprintf(buf, "%d\n", data->value); \ return sprintf(buf, "%d\n", data->value); \
@ -159,7 +159,7 @@ show2(alarms);
show2(die_code); show2(die_code);
#define set(value, reg) \ #define set(value, reg) \
static ssize_t set_##value(struct device *dev, const char *buf, size_t count) \ static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
struct adm1021_data *data = i2c_get_clientdata(client); \ struct adm1021_data *data = i2c_get_clientdata(client); \

28
drivers/i2c/chips/adm1025.c
View file

@ -153,19 +153,19 @@ struct adm1025_data {
*/ */
#define show_in(offset) \ #define show_in(offset) \
static ssize_t show_in##offset(struct device *dev, char *buf) \ static ssize_t show_in##offset(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
in_scale[offset])); \ in_scale[offset])); \
} \ } \
static ssize_t show_in##offset##_min(struct device *dev, char *buf) \ static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
in_scale[offset])); \ in_scale[offset])); \
} \ } \
static ssize_t show_in##offset##_max(struct device *dev, char *buf) \ static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
@ -180,17 +180,17 @@ show_in(4);
show_in(5); show_in(5);
#define show_temp(offset) \ #define show_temp(offset) \
static ssize_t show_temp##offset(struct device *dev, char *buf) \ static ssize_t show_temp##offset(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
} \ } \
static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \ static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
} \ } \
static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \ static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct adm1025_data *data = adm1025_update_device(dev); \ struct adm1025_data *data = adm1025_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
@ -200,7 +200,7 @@ show_temp(1);
show_temp(2); show_temp(2);
#define set_in(offset) \ #define set_in(offset) \
static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \ static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
@ -214,7 +214,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
up(&data->update_lock); \ up(&data->update_lock); \
return count; \ return count; \
} \ } \
static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \ static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
@ -240,7 +240,7 @@ set_in(4);
set_in(5); set_in(5);
#define set_temp(offset) \ #define set_temp(offset) \
static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \ static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
@ -254,7 +254,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
up(&data->update_lock); \ up(&data->update_lock); \
return count; \ return count; \
} \ } \
static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
@ -275,26 +275,26 @@ static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
set_temp(1); set_temp(1);
set_temp(2); set_temp(2);
static ssize_t show_alarms(struct device *dev, char *buf) static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1025_data *data = adm1025_update_device(dev); struct adm1025_data *data = adm1025_update_device(dev);
return sprintf(buf, "%u\n", data->alarms); return sprintf(buf, "%u\n", data->alarms);
} }
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
static ssize_t show_vid(struct device *dev, char *buf) static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1025_data *data = adm1025_update_device(dev); struct adm1025_data *data = adm1025_update_device(dev);
return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm)); return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
} }
static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL); static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
static ssize_t show_vrm(struct device *dev, char *buf) static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1025_data *data = adm1025_update_device(dev); struct adm1025_data *data = adm1025_update_device(dev);
return sprintf(buf, "%u\n", data->vrm); return sprintf(buf, "%u\n", data->vrm);
} }
static ssize_t set_vrm(struct device *dev, const char *buf, size_t count) static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adm1025_data *data = i2c_get_clientdata(client); struct adm1025_data *data = i2c_get_clientdata(client);

98
drivers/i2c/chips/adm1026.c
View file

@ -754,24 +754,24 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
} }
#define in_reg(offset) \ #define in_reg(offset) \
static ssize_t show_in##offset (struct device *dev, char *buf) \ static ssize_t show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in(dev, buf, offset); \ return show_in(dev, buf, offset); \
} \ } \
static ssize_t show_in##offset##_min (struct device *dev, char *buf) \ static ssize_t show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_min(dev, buf, offset); \ return show_in_min(dev, buf, offset); \
} \ } \
static ssize_t set_in##offset##_min (struct device *dev, \ static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, offset); \ return set_in_min(dev, buf, count, offset); \
} \ } \
static ssize_t show_in##offset##_max (struct device *dev, char *buf) \ static ssize_t show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_max(dev, buf, offset); \ return show_in_max(dev, buf, offset); \
} \ } \
static ssize_t set_in##offset##_max (struct device *dev, \ static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, offset); \ return set_in_max(dev, buf, count, offset); \
@ -800,19 +800,19 @@ in_reg(13);
in_reg(14); in_reg(14);
in_reg(15); in_reg(15);
static ssize_t show_in16(struct device *dev, char *buf) static ssize_t show_in16(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in[16]) - return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in[16]) -
NEG12_OFFSET); NEG12_OFFSET);
} }
static ssize_t show_in16_min(struct device *dev, char *buf) static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_min[16]) return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_min[16])
- NEG12_OFFSET); - NEG12_OFFSET);
} }
static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count) static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adm1026_data *data = i2c_get_clientdata(client); struct adm1026_data *data = i2c_get_clientdata(client);
@ -824,13 +824,13 @@ static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count)
up(&data->update_lock); up(&data->update_lock);
return count; return count;
} }
static ssize_t show_in16_max(struct device *dev, char *buf) static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_max[16]) return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_max[16])
- NEG12_OFFSET); - NEG12_OFFSET);
} }
static ssize_t set_in16_max(struct device *dev, const char *buf, size_t count) static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adm1026_data *data = i2c_get_clientdata(client); struct adm1026_data *data = i2c_get_clientdata(client);
@ -880,15 +880,15 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
} }
#define fan_offset(offset) \ #define fan_offset(offset) \
static ssize_t show_fan_##offset (struct device *dev, char *buf) \ static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan(dev, buf, offset - 1); \ return show_fan(dev, buf, offset - 1); \
} \ } \
static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \ static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_min(dev, buf, offset - 1); \ return show_fan_min(dev, buf, offset - 1); \
} \ } \
static ssize_t set_fan_##offset##_min (struct device *dev, \ static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, offset - 1); \ return set_fan_min(dev, buf, count, offset - 1); \
@ -967,11 +967,11 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
} }
#define fan_offset_div(offset) \ #define fan_offset_div(offset) \
static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \ static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_div(dev, buf, offset - 1); \ return show_fan_div(dev, buf, offset - 1); \
} \ } \
static ssize_t set_fan_##offset##_div (struct device *dev, \ static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
@ -1033,24 +1033,24 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
return count; return count;
} }
#define temp_reg(offset) \ #define temp_reg(offset) \
static ssize_t show_temp_##offset (struct device *dev, char *buf) \ static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp(dev, buf, offset - 1); \ return show_temp(dev, buf, offset - 1); \
} \ } \
static ssize_t show_temp_##offset##_min (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_min(dev, buf, offset - 1); \ return show_temp_min(dev, buf, offset - 1); \
} \ } \
static ssize_t show_temp_##offset##_max (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_max(dev, buf, offset - 1); \ return show_temp_max(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_min (struct device *dev, \ static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_min(dev, buf, count, offset - 1); \ return set_temp_min(dev, buf, count, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_max (struct device *dev, \ static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, offset - 1); \ return set_temp_max(dev, buf, count, offset - 1); \
@ -1087,11 +1087,11 @@ static ssize_t set_temp_offset(struct device *dev, const char *buf,
} }
#define temp_offset_reg(offset) \ #define temp_offset_reg(offset) \
static ssize_t show_temp_##offset##_offset (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_offset(dev, buf, offset - 1); \ return show_temp_offset(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_offset (struct device *dev, \ static ssize_t set_temp_##offset##_offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_offset(dev, buf, count, offset - 1); \ return set_temp_offset(dev, buf, count, offset - 1); \
@ -1139,22 +1139,22 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev, const char *buf,
} }
#define temp_auto_point(offset) \ #define temp_auto_point(offset) \
static ssize_t show_temp##offset##_auto_point1_temp (struct device *dev, \ static ssize_t show_temp##offset##_auto_point1_temp (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_point1_temp(dev, buf, offset - 1); \ return show_temp_auto_point1_temp(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp##offset##_auto_point1_temp (struct device *dev, \ static ssize_t set_temp##offset##_auto_point1_temp (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_auto_point1_temp(dev, buf, count, offset - 1); \ return set_temp_auto_point1_temp(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_temp##offset##_auto_point1_temp_hyst (struct device \ static ssize_t show_temp##offset##_auto_point1_temp_hyst (struct device \
*dev, char *buf) \ *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_auto_point1_temp_hyst(dev, buf, offset - 1); \ return show_temp_auto_point1_temp_hyst(dev, buf, offset - 1); \
} \ } \
static ssize_t show_temp##offset##_auto_point2_temp (struct device *dev, \ static ssize_t show_temp##offset##_auto_point2_temp (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_point2_temp(dev, buf, offset - 1); \ return show_temp_auto_point2_temp(dev, buf, offset - 1); \
@ -1171,12 +1171,12 @@ temp_auto_point(1);
temp_auto_point(2); temp_auto_point(2);
temp_auto_point(3); temp_auto_point(3);
static ssize_t show_temp_crit_enable(struct device *dev, char *buf) static ssize_t show_temp_crit_enable(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", (data->config1 & CFG1_THERM_HOT) >> 4); return sprintf(buf,"%d\n", (data->config1 & CFG1_THERM_HOT) >> 4);
} }
static ssize_t set_temp_crit_enable(struct device *dev, const char *buf, static ssize_t set_temp_crit_enable(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1224,11 +1224,11 @@ static ssize_t set_temp_crit(struct device *dev, const char *buf,
} }
#define temp_crit_reg(offset) \ #define temp_crit_reg(offset) \
static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_crit(dev, buf, offset - 1); \ return show_temp_crit(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_crit (struct device *dev, \ static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_crit(dev, buf, count, offset - 1); \ return set_temp_crit(dev, buf, count, offset - 1); \
@ -1240,12 +1240,12 @@ temp_crit_reg(1);
temp_crit_reg(2); temp_crit_reg(2);
temp_crit_reg(3); temp_crit_reg(3);
static ssize_t show_analog_out_reg(struct device *dev, char *buf) static ssize_t show_analog_out_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", DAC_FROM_REG(data->analog_out)); return sprintf(buf,"%d\n", DAC_FROM_REG(data->analog_out));
} }
static ssize_t set_analog_out_reg(struct device *dev, const char *buf, static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1262,7 +1262,7 @@ static ssize_t set_analog_out_reg(struct device *dev, const char *buf,
static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg, static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg,
set_analog_out_reg); set_analog_out_reg);
static ssize_t show_vid_reg(struct device *dev, char *buf) static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm)); return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
@ -1270,12 +1270,12 @@ static ssize_t show_vid_reg(struct device *dev, char *buf)
static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL); static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL);
static ssize_t show_vrm_reg(struct device *dev, char *buf) static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->vrm); return sprintf(buf,"%d\n", data->vrm);
} }
static ssize_t store_vrm_reg(struct device *dev, const char *buf, static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1287,7 +1287,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf,
static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
static ssize_t show_alarms_reg(struct device *dev, char *buf) static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf, "%ld\n", (long) (data->alarms)); return sprintf(buf, "%ld\n", (long) (data->alarms));
@ -1295,12 +1295,12 @@ static ssize_t show_alarms_reg(struct device *dev, char *buf)
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
static ssize_t show_alarm_mask(struct device *dev, char *buf) static ssize_t show_alarm_mask(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->alarm_mask); return sprintf(buf,"%ld\n", data->alarm_mask);
} }
static ssize_t set_alarm_mask(struct device *dev, const char *buf, static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1331,12 +1331,12 @@ static DEVICE_ATTR(alarm_mask, S_IRUGO | S_IWUSR, show_alarm_mask,
set_alarm_mask); set_alarm_mask);
static ssize_t show_gpio(struct device *dev, char *buf) static ssize_t show_gpio(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->gpio); return sprintf(buf,"%ld\n", data->gpio);
} }
static ssize_t set_gpio(struct device *dev, const char *buf, static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1359,12 +1359,12 @@ static ssize_t set_gpio(struct device *dev, const char *buf,
static DEVICE_ATTR(gpio, S_IRUGO | S_IWUSR, show_gpio, set_gpio); static DEVICE_ATTR(gpio, S_IRUGO | S_IWUSR, show_gpio, set_gpio);
static ssize_t show_gpio_mask(struct device *dev, char *buf) static ssize_t show_gpio_mask(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%ld\n", data->gpio_mask); return sprintf(buf,"%ld\n", data->gpio_mask);
} }
static ssize_t set_gpio_mask(struct device *dev, const char *buf, static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1386,12 +1386,12 @@ static ssize_t set_gpio_mask(struct device *dev, const char *buf,
static DEVICE_ATTR(gpio_mask, S_IRUGO | S_IWUSR, show_gpio_mask, set_gpio_mask); static DEVICE_ATTR(gpio_mask, S_IRUGO | S_IWUSR, show_gpio_mask, set_gpio_mask);
static ssize_t show_pwm_reg(struct device *dev, char *buf) static ssize_t show_pwm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", PWM_FROM_REG(data->pwm1.pwm)); return sprintf(buf,"%d\n", PWM_FROM_REG(data->pwm1.pwm));
} }
static ssize_t set_pwm_reg(struct device *dev, const char *buf, static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1407,12 +1407,12 @@ static ssize_t set_pwm_reg(struct device *dev, const char *buf,
} }
return count; return count;
} }
static ssize_t show_auto_pwm_min(struct device *dev, char *buf) static ssize_t show_auto_pwm_min(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->pwm1.auto_pwm_min); return sprintf(buf,"%d\n", data->pwm1.auto_pwm_min);
} }
static ssize_t set_auto_pwm_min(struct device *dev, const char *buf, static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -1429,16 +1429,16 @@ static ssize_t set_auto_pwm_min(struct device *dev, const char *buf,
up(&data->update_lock); up(&data->update_lock);
return count; return count;
} }
static ssize_t show_auto_pwm_max(struct device *dev, char *buf) static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
{ {
return sprintf(buf,"%d\n", ADM1026_PWM_MAX); return sprintf(buf,"%d\n", ADM1026_PWM_MAX);
} }
static ssize_t show_pwm_enable(struct device *dev, char *buf) static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct adm1026_data *data = adm1026_update_device(dev); struct adm1026_data *data = adm1026_update_device(dev);
return sprintf(buf,"%d\n", data->pwm1.enable); return sprintf(buf,"%d\n", data->pwm1.enable);
} }
static ssize_t set_pwm_enable(struct device *dev, const char *buf, static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, const char *buf,
size_t count) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);