[Armadeus-commitlog] SF.net SVN: armadeus: [688] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus: [688] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1
|
From: <th...@us...> - 2007-11-17 10:24:19
|
Revision: 688
http://armadeus.svn.sourceforge.net/armadeus/?rev=688&view=rev
Author: thom25
Date: 2007-11-17 02:24:24 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
fix compilation warnings
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/055-linux-2.6.23.1-rtc-ds1374.diff
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/062-linux-2.6.23.1-max1027.diff
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/055-linux-2.6.23.1-rtc-ds1374.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/055-linux-2.6.23.1-rtc-ds1374.diff 2007-11-17 09:21:20 UTC (rev 687)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/055-linux-2.6.23.1-rtc-ds1374.diff 2007-11-17 10:24:24 UTC (rev 688)
@@ -29,7 +29,7 @@
obj-$(CONFIG_RTC_DRV_DS1742) += rtc-ds1742.o
--- ref/linux-2.6.23.1/drivers/rtc/rtc-ds1374.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.23.1/drivers/rtc/rtc-ds1374.c 2007-02-27 17:52:19.000000000 +0100
-@@ -0,0 +1,282 @@
+@@ -0,0 +1,284 @@
+/*
+ * An rtc/alarm/i2c driver for the Dallas ds1374
+ * based on rts-ds1672 driver from Alessandro Zummo
@@ -130,8 +130,8 @@
+ unsigned long secs;
+
+ dev_dbg(&client->dev,
-+ "%s: secs=%d, mins=%d, hours=%d, ",
-+ "mday=%d, mon=%d, year=%d, wday=%d\n",
++ "%s: secs=%d, mins=%d, hours=%d, \
++ mday=%d, mon=%d, year=%d, wday=%d \n",
+ __FUNCTION__,
+ tm->tm_sec, tm->tm_min, tm->tm_hour,
+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -278,10 +278,12 @@
+ "Set time to enable.\n");
+
+ /* Register sysfs hooks */
-+ device_create_file(&client->dev, &dev_attr_control);
++ err = device_create_file(&client->dev, &dev_attr_control);
++ if (err)
++ printk(KERN_WARNING "Unable to create sysfs attribute file for DS1374\n");
++ else
++ return 0;
+
-+ return 0;
-+
+exit_detach:
+ if (!IS_ERR(rtc))
+ rtc_device_unregister(rtc);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/062-linux-2.6.23.1-max1027.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/062-linux-2.6.23.1-max1027.diff 2007-11-17 09:21:20 UTC (rev 687)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/062-linux-2.6.23.1-max1027.diff 2007-11-17 10:24:24 UTC (rev 688)
@@ -31,7 +31,7 @@
diff -purN ma/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/hwmon/max1027.c linux-2.6.18.1/drivers/hwmon/max1027.c
--- ma/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/hwmon/max1027.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.18.1/drivers/hwmon/max1027.c 2007-01-17 20:12:54.748893800 +0100
-@@ -0,0 +1,339 @@
+@@ -0,0 +1,361 @@
+/*
+ * max1027.c
+ *
@@ -253,6 +253,7 @@
+ struct max1027 *p_max1027;
+ int status;
+
++ printk("probe\n");
+ p_max1027 = kzalloc(sizeof *p_max1027, GFP_KERNEL);
+ if (!p_max1027)
+ return -ENOMEM;
@@ -272,38 +273,58 @@
+ goto out_dev_create_file_failed;
+ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_config))
++ if ((status = device_create_file(&spi->dev, &dev_attr_config))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 config\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_conv))
++ if ((status = device_create_file(&spi->dev, &dev_attr_conv))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 conv\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_temp1_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_temp1_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 temp1\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in0_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in0_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in0\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in1_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in1_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in1\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in2_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in2_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in2\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in3_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in3_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in3\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in4_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in4_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in4\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in5_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in5_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in5\n");
++ goto out_dev_create_file_failed;
++ }
+
-+ if (device_create_file(&spi->dev, &dev_attr_in6_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in6_input)))
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in6\n");
+
-+ if (device_create_file(&spi->dev, &dev_attr_in7_input))
++ if ((status = device_create_file(&spi->dev, &dev_attr_in7_input))){
+ printk(KERN_WARNING "Unable to create sysfs attribute for max1027 in7\n");
++ goto out_dev_create_file_failed;
++ }
+
+ // setup spi device
+ spi->bits_per_word = 8;
@@ -357,6 +378,7 @@
+
+static int __init init_max1027(void)
+{
++ printk("init\n");
+ return spi_register_driver(&max1027_driver);
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
