Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74880c06 authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ff381d22

drivers/base/dmapool.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct dma_page { /* cacheable header for 'allocation' bytes */ 
static DECLARE_MUTEX (pools_lock);



static ssize_t

show_pools (struct device *dev, char *buf)

show_pools (struct device *dev, struct device_attribute *attr, char *buf)

{

	unsigned temp;

	unsigned size;

drivers/base/power/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
 *	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);

}



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;

	char * rest;

drivers/block/ub.c

+1 −1
Original line number Diff line number Diff line
@@ -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 ub_dev *sc;

drivers/char/hvcs.c

+7 −7
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ static inline struct hvcs_struct *from_vio_dev(struct vio_dev *viod) 
}

/* 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 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 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 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 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)

{

	/*
@@ -1505,7 +1505,7 @@ static ssize_t hvcs_current_vty_store(struct device *dev, const char * buf, 
	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 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,

	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)

{

	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;

}



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 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,

		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 hvcs_struct *hvcsd = from_vio_dev(viod);

drivers/char/mbcs.c

+2 −2
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static inline int mbcs_hw_init(struct mbcs_soft *soft) 
	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 mbcs_soft *soft = cx_dev->soft;
@@ -715,7 +715,7 @@ static ssize_t show_algo(struct device *dev, char *buf) 
		       (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;

	struct cx_dev *cx_dev = to_cx_dev(dev);