Skip to contentSkip to conversation

drivers/cio/device.c - drivers/scsi/zfcp_scsi.c: (dynamic sysfs callbacks) update device attribute callbacks

PATCH In review Yani Ioannou 1 participant 1 message May 14, 2005

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 9/12 drivers/cio/device.c - drivers/scsi/zfcp_scsi.c: (dynamic sysfs callbacks) update device attribute callbacks

---

 cio/device.c     |   14 +++---
 net/claw.c       |   40 ++++++++---------
 net/ctcmain.c    |   18 +++----
 net/lcs.c        |   10 ++--
 net/netiucv.c    |   44 +++++++++----------
 net/qeth_sys.c   |  126 +++++++++++++++++++++++++++----------------------------
 scsi/zfcp_scsi.c |    2 
 7 files changed, 127 insertions(+), 127 deletions(-)
drivers/s390/cio/device.c +7 -7
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/cio/device.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/cio/device.c
@@ -204,7 +204,7 @@ module_exit(cleanup_ccw_bus_type);
  * TODO: Split chpids and pimpampom up? Where is "in use" in the tree?
  */
 static ssize_t
-chpids_show (struct device * dev, char * buf)
+chpids_show (struct device * dev, char * buf, void *private)
 {
 	struct subchannel *sch = to_subchannel(dev);
 	struct ssd_info *ssd = &sch->ssd_info;
@@ -219,7 +219,7 @@ chpids_show (struct device * dev, char *
 }
 
 static ssize_t
-pimpampom_show (struct device * dev, char * buf)
+pimpampom_show (struct device * dev, char * buf, void *private)
 {
 	struct subchannel *sch = to_subchannel(dev);
 	struct pmcw *pmcw = &sch->schib.pmcw;
@@ -229,7 +229,7 @@ pimpampom_show (struct device * dev, cha
 }
 
 static ssize_t
-devtype_show (struct device *dev, char *buf)
+devtype_show (struct device *dev, char *buf, void *private)
 {
 	struct ccw_device *cdev = to_ccwdev(dev);
 	struct ccw_device_id *id = &(cdev->id);
@@ -242,7 +242,7 @@ devtype_show (struct device *dev, char *
 }
 
 static ssize_t
-cutype_show (struct device *dev, char *buf)
+cutype_show (struct device *dev, char *buf, void *private)
 {
 	struct ccw_device *cdev = to_ccwdev(dev);
 	struct ccw_device_id *id = &(cdev->id);
@@ -252,7 +252,7 @@ cutype_show (struct device *dev, char *b
 }
 
 static ssize_t
-online_show (struct device *dev, char *buf)
+online_show (struct device *dev, char *buf, void *private)
 {
 	struct ccw_device *cdev = to_ccwdev(dev);
 
@@ -350,7 +350,7 @@ ccw_device_set_online(struct ccw_device 
 }
 
 static ssize_t
-online_store (struct device *dev, const char *buf, size_t count)
+online_store (struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct ccw_device *cdev = to_ccwdev(dev);
 	int i, force, ret;
@@ -422,7 +422,7 @@ online_store (struct device *dev, const 
 }
 
 static ssize_t
-available_show (struct device *dev, char *buf)
+available_show (struct device *dev, char *buf, void *private)
 {
 	struct ccw_device *cdev = to_ccwdev(dev);
 	struct subchannel *sch;
drivers/s390/net/claw.c +20 -20
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/net/claw.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/net/claw.c
@@ -241,21 +241,21 @@ static struct sk_buff *claw_pack_skb(str
 static void dumpit (char *buf, int len);
 #endif
 /* sysfs Functions */
-static ssize_t claw_hname_show(struct device *dev, char *buf);
+static ssize_t claw_hname_show(struct device *dev, char *buf, void *private);
 static ssize_t claw_hname_write(struct device *dev,
-	const char *buf, size_t count);
-static ssize_t claw_adname_show(struct device *dev, char *buf);
+	const char *buf, size_t count, void *private);
+static ssize_t claw_adname_show(struct device *dev, char *buf, void *private);
 static ssize_t claw_adname_write(struct device *dev,
-	const char *buf, size_t count);
-static ssize_t claw_apname_show(struct device *dev, char *buf);
+	const char *buf, size_t count, void *private);
+static ssize_t claw_apname_show(struct device *dev, char *buf, void *private);
 static ssize_t claw_apname_write(struct device *dev,
-	const char *buf, size_t count);
-static ssize_t claw_wbuff_show(struct device *dev, char *buf);
+	const char *buf, size_t count, void *private);
+static ssize_t claw_wbuff_show(struct device *dev, char *buf, void *private);
 static ssize_t claw_wbuff_write(struct device *dev,
-	const char *buf, size_t count);
-static ssize_t claw_rbuff_show(struct device *dev, char *buf);
+	const char *buf, size_t count, void *private);
+static ssize_t claw_rbuff_show(struct device *dev, char *buf, void *private);
 static ssize_t claw_rbuff_write(struct device *dev,
-	const char *buf, size_t count);
+	const char *buf, size_t count, void *private);
 static int claw_add_files(struct device *dev);
 static void claw_remove_files(struct device *dev);
 
@@ -4149,7 +4149,7 @@ claw_remove_device(struct ccwgroup_devic
  * sysfs attributes
  */
 static ssize_t
-claw_hname_show(struct device *dev, char *buf)
+claw_hname_show(struct device *dev, char *buf, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4162,7 +4162,7 @@ claw_hname_show(struct device *dev, char
 }
 
 static ssize_t
-claw_hname_write(struct device *dev, const char *buf, size_t count)
+claw_hname_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4186,7 +4186,7 @@ claw_hname_write(struct device *dev, con
 static DEVICE_ATTR(host_name, 0644, claw_hname_show, claw_hname_write);
 
 static ssize_t
-claw_adname_show(struct device *dev, char *buf)
+claw_adname_show(struct device *dev, char *buf, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4199,7 +4199,7 @@ claw_adname_show(struct device *dev, cha
 }
 
 static ssize_t
-claw_adname_write(struct device *dev, const char *buf, size_t count)
+claw_adname_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4223,7 +4223,7 @@ claw_adname_write(struct device *dev, co
 static DEVICE_ATTR(adapter_name, 0644, claw_adname_show, claw_adname_write);
 
 static ssize_t
-claw_apname_show(struct device *dev, char *buf)
+claw_apname_show(struct device *dev, char *buf, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4237,7 +4237,7 @@ claw_apname_show(struct device *dev, cha
 }
 
 static ssize_t
-claw_apname_write(struct device *dev, const char *buf, size_t count)
+claw_apname_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4271,7 +4271,7 @@ claw_apname_write(struct device *dev, co
 static DEVICE_ATTR(api_type, 0644, claw_apname_show, claw_apname_write);
 
 static ssize_t
-claw_wbuff_show(struct device *dev, char *buf)
+claw_wbuff_show(struct device *dev, char *buf, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env * p_env;
@@ -4284,7 +4284,7 @@ claw_wbuff_show(struct device *dev, char
 }
 
 static ssize_t
-claw_wbuff_write(struct device *dev, const char *buf, size_t count)
+claw_wbuff_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4312,7 +4312,7 @@ claw_wbuff_write(struct device *dev, con
 static DEVICE_ATTR(write_buffer, 0644, claw_wbuff_show, claw_wbuff_write);
 
 static ssize_t
-claw_rbuff_show(struct device *dev, char *buf)
+claw_rbuff_show(struct device *dev, char *buf, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *  p_env;
@@ -4325,7 +4325,7 @@ claw_rbuff_show(struct device *dev, char
 }
 
 static ssize_t
-claw_rbuff_write(struct device *dev, const char *buf, size_t count)
+claw_rbuff_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct claw_privbk *priv;
 	struct claw_env *p_env;
drivers/s390/net/ctcmain.c +9 -9
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/net/ctcmain.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/net/ctcmain.c
@@ -2698,7 +2698,7 @@ ctc_stats(struct net_device * dev)
  * sysfs attributes
  */
 static ssize_t
-buffer_show(struct device *dev, char *buf)
+buffer_show(struct device *dev, char *buf, void *private)
 {
 	struct ctc_priv *priv;
 
@@ -2710,7 +2710,7 @@ buffer_show(struct device *dev, char *bu
 }
 
 static ssize_t
-buffer_write(struct device *dev, const char *buf, size_t count)
+buffer_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct ctc_priv *priv;
 	struct net_device *ndev;
@@ -2746,7 +2746,7 @@ buffer_write(struct device *dev, const c
 }
 
 static ssize_t
-loglevel_show(struct device *dev, char *buf)
+loglevel_show(struct device *dev, char *buf, void *private)
 {
 	struct ctc_priv *priv;
 
@@ -2757,7 +2757,7 @@ loglevel_show(struct device *dev, char *
 }
 
 static ssize_t
-loglevel_write(struct device *dev, const char *buf, size_t count)
+loglevel_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct ctc_priv *priv;
 	int ll1;
@@ -2814,7 +2814,7 @@ ctc_print_statistics(struct ctc_priv *pr
 }
 
 static ssize_t
-stats_show(struct device *dev, char *buf)
+stats_show(struct device *dev, char *buf, void *private)
 {
 	struct ctc_priv *priv = dev->driver_data;
 	if (!priv)
@@ -2824,7 +2824,7 @@ stats_show(struct device *dev, char *buf
 }
 
 static ssize_t
-stats_write(struct device *dev, const char *buf, size_t count)
+stats_write(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct ctc_priv *priv = dev->driver_data;
 	if (!priv)
@@ -2946,7 +2946,7 @@ ctc_init_netdevice(struct net_device * d
 }
 
 static ssize_t
-ctc_proto_show(struct device *dev, char *buf)
+ctc_proto_show(struct device *dev, char *buf, void *private)
 {
 	struct ctc_priv *priv;
 
@@ -2958,7 +2958,7 @@ ctc_proto_show(struct device *dev, char 
 }
 
 static ssize_t
-ctc_proto_store(struct device *dev, const char *buf, size_t count)
+ctc_proto_store(struct device *dev, const char *buf, size_t count, void *private)
 {
 	struct ctc_priv *priv;
 	int value;
@@ -2980,7 +2980,7 @@ ctc_proto_store(struct device *dev, cons
 static DEVICE_ATTR(protocol, 0644, ctc_proto_show, ctc_proto_store);
 
 static ssize_t
-ctc_type_show(struct device *dev, char *buf)
+ctc_type_show(struct device *dev, char *buf, void *private)
 {
 	struct ccwgroup_device *cgdev;
 
drivers/s390/net/lcs.c +5 -5
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/net/lcs.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/net/lcs.c
@@ -1992,7 +1992,7 @@ lcs_open_device(struct net_device *dev)
  * show function for portno called by cat or similar things
  */
 static ssize_t
-lcs_portno_show (struct device *dev, char *buf)
+lcs_portno_show (struct device *dev, char *buf, void *private)
 {
         struct lcs_card *card;
 
@@ -2008,7 +2008,7 @@ lcs_portno_show (struct device *dev, cha
  * store the value which is piped to file portno
  */
 static ssize_t
-lcs_portno_store (struct device *dev, const char *buf, size_t count)
+lcs_portno_store (struct device *dev, const char *buf, size_t count, void *private)
 {
         struct lcs_card *card;
         int value;
@@ -2029,7 +2029,7 @@ lcs_portno_store (struct device *dev, co
 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
 
 static ssize_t
-lcs_type_show(struct device *dev, char *buf)
+lcs_type_show(struct device *dev, char *buf, void *private)
 {
 	struct ccwgroup_device *cgdev;
 
@@ -2043,7 +2043,7 @@ lcs_type_show(struct device *dev, char *
 static DEVICE_ATTR(type, 0444, lcs_type_show, NULL);
 
 static ssize_t
-lcs_timeout_show(struct device *dev, char *buf)
+lcs_timeout_show(struct device *dev, char *buf, void *private)
 {
 	struct lcs_card *card;
 
@@ -2053,7 +2053,7 @@ lcs_timeout_show(struct device *dev, cha
 }
 
 static ssize_t
-lcs_timeout_store (struct device *dev, const char *buf, size_t count)
+lcs_timeout_store (struct device *dev, const char *buf, size_t count, void *private)
 {
         struct lcs_card *card;
         int value;
drivers/s390/net/netiucv.c +22 -22

176 lines not on this page · raw message

drivers/s390/net/qeth_sys.c +63 -63

504 lines not on this page · raw message

drivers/s390/scsi/zfcp_scsi.c +1 -1
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/drivers/s390/scsi/zfcp_scsi.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-nowarn/drivers/s390/scsi/zfcp_scsi.c
@@ -923,7 +923,7 @@ struct fc_function_template zfcp_transpo
  */
 #define ZFCP_DEFINE_SCSI_ATTR(_name, _format, _value)                    \
 static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,        \
-                                              char *buf)                 \
+                                              char *buf, void *private)                 \
 {                                                                        \
         struct scsi_device *sdev;                                        \
         struct zfcp_unit *unit;                                          \