From mboxrd@z Thu Jan 1 00:00:00 1970 From: greg@kroah.com (Greg KH) Date: Thu, 19 May 2005 06:24:18 +0000 Subject: [PATCH] i2c driver fixes for 2.6.0-test5 Message-Id: <10642734262057@kroah.com> List-Id: In-Reply-To: <10642734262038@kroah.com> References: <1064273416272@kroah.com> In-Reply-To: <1064273416272@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset="macroman" Content-Transfer-Encoding: base64 To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com Q2hhbmdlU2V0IDEuMTMxNS4xLjIwLCAyMDAzLzA5LzIyIDEzOjQ0OjEzLTA3OjAwLCBncmVnQGty b2FoLmNvbQoKW1BBVENIXSBJMkM6IGNsZWFuIHVwIHRoZSBpMmMtZWx2LmMgZHJpdmVyIGEgYml0 CgoKIGRyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtZWx2LmMgfCAgIDIxICsrKysrKysrKy0tLS0tLS0t LS0tLQogMSBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoK CmRpZmYgLU5ydSBhL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtZWx2LmMgYi9kcml2ZXJzL2kyYy9i dXNzZXMvaTJjLWVsdi5jCi0tLSBhL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtZWx2LmMJTW9uIFNl cCAyMiAxNjoxMjo0NiAyMDAzCisrKyBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtZWx2LmMJTW9u IFNlcCAyMiAxNjoxMjo0NiAyMDAzCkBAIC0yMSw4ICsyMSw2IEBACiAvKiBXaXRoIHNvbWUgY2hh bmdlcyBmcm9tIEt5P3N0aSBNP2xra2kgPGttYWxra2lAY2MuaHV0LmZpPiBhbmQgZXZlbgogICAg RnJvZG8gTG9vaWphYXJkIDxmcm9kb2xAZGRzLm5sPiAqLwogCi0vKiAkSWQ6IGkyYy1lbHYuYyx2 IDEuMjcgMjAwMy8wMS8yMSAwODowODoxNiBrbWFsa2tpIEV4cCAkICovCi0KICNpbmNsdWRlIDxs aW51eC9rZXJuZWwuaD4KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KICNpbmNsdWRlIDxsaW51 eC9kZWxheS5oPgpAQCAtMzYsNyArMzQsNyBAQAogCiAjZGVmaW5lIERFRkFVTFRfQkFTRSAweDM3 OAogc3RhdGljIGludCBiYXNlPTA7Ci1zdGF0aWMgdW5zaWduZWQgY2hhciBQb3J0RGF0YSA9IDA7 CitzdGF0aWMgdW5zaWduZWQgY2hhciBwb3J0X2RhdGEgPSAwOwogCiAvKiAtLS0tLSBnbG9iYWwg ZGVmaW5lcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQkq LwogI2RlZmluZSBERUIoeCkJCS8qIHNob3VsZCBiZSByZWFzb25hYmxlIG9wZW4sIGNsb3NlICZj LiAJKi8KQEAgLTU3LDIxICs1NSwyMSBAQAogc3RhdGljIHZvaWQgYml0X2Vsdl9zZXRzY2wodm9p ZCAqZGF0YSwgaW50IHN0YXRlKQogewogCWlmIChzdGF0ZSkgewotCQlQb3J0RGF0YSAmPSAweGZl OworCQlwb3J0X2RhdGEgJj0gMHhmZTsKIAl9IGVsc2UgewotCQlQb3J0RGF0YSB8PTE7CisJCXBv cnRfZGF0YSB8PTE7CiAJfQotCW91dGIoUG9ydERhdGEsIERBVEEpOworCW91dGIocG9ydF9kYXRh LCBEQVRBKTsKIH0KIAogc3RhdGljIHZvaWQgYml0X2Vsdl9zZXRzZGEodm9pZCAqZGF0YSwgaW50 IHN0YXRlKQogewogCWlmIChzdGF0ZSkgewotCQlQb3J0RGF0YSAmPTB4ZmQ7CisJCXBvcnRfZGF0 YSAmPTB4ZmQ7CiAJfSBlbHNlIHsKLQkJUG9ydERhdGEgfD0yOworCQlwb3J0X2RhdGEgfD0yOwog CX0KLQlvdXRiKFBvcnREYXRhLCBEQVRBKTsKKwlvdXRiKHBvcnRfZGF0YSwgREFUQSk7CiB9IAog CiBzdGF0aWMgaW50IGJpdF9lbHZfZ2V0c2NsKHZvaWQgKmRhdGEpCkBAIC0xMDMsNyArMTAxLDcg QEAKIAkJZ290byBmYWlsOwogCX0KIAotCVBvcnREYXRhID0gMDsKKwlwb3J0X2RhdGEgPSAwOwog CWJpdF9lbHZfc2V0c2RhKCh2b2lkKiliYXNlLDEpOwogCWJpdF9lbHZfc2V0c2NsKCh2b2lkKili YXNlLDEpOwogCXJldHVybiAwOwpAQCAtMTI5LDE0ICsxMjcsMTMgQEAKIAogc3RhdGljIHN0cnVj dCBpMmNfYWRhcHRlciBiaXRfZWx2X29wcyA9IHsKIAkub3duZXIJCT0gVEhJU19NT0RVTEUsCi0J LmlkCQk9IEkyQ19IV19CX0VMViwKIAkuYWxnb19kYXRhCT0gJmJpdF9lbHZfZGF0YSwKIAkubmFt ZQkJPSAiRUxWIFBhcmFsbGVsIHBvcnQgYWRhcHRvciIsCiB9OwogCiBzdGF0aWMgaW50IF9faW5p dCBpMmNfYml0ZWx2X2luaXQodm9pZCkKIHsKLQlwcmludGsoS0VSTl9JTkZPICJpMmMtZWx2Lm86 IGkyYyBFTFYgcGFyYWxsZWwgcG9ydCBhZGFwdGVyIG1vZHVsZSB2ZXJzaW9uICVzICglcylcbiIs IEkyQ19WRVJTSU9OLCBJMkNfREFURSk7CisJcHJpbnRrKEtFUk5fSU5GTyAiaTJjIEVMViBwYXJh bGxlbCBwb3J0IGFkYXB0ZXIgZHJpdmVyXG4iKTsKIAlpZiAoYmFzZT0wKSB7CiAJCS8qIHByb2Jl IHNvbWUgdmFsdWVzICovCiAJCWJhc2XeRkFVTFRfQkFTRTsKCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263024AbTIVX76 (ORCPT ); Mon, 22 Sep 2003 19:59:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262807AbTIVX7W (ORCPT ); Mon, 22 Sep 2003 19:59:22 -0400 Received: from mail.kroah.org ([65.200.24.183]:28833 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S262813AbTIVXb2 convert rfc822-to-8bit (ORCPT ); Mon, 22 Sep 2003 19:31:28 -0400 Content-Type: text/plain; charset="iso-8859-1" Message-Id: <10642734262057@kroah.com> Subject: Re: [PATCH] i2c driver fixes for 2.6.0-test5 In-Reply-To: <10642734262038@kroah.com> From: Greg KH X-Mailer: gregkh_patchbomb Date: Mon, 22 Sep 2003 16:30:26 -0700 Content-Transfer-Encoding: 8BIT To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org ChangeSet 1.1315.1.20, 2003/09/22 13:44:13-07:00, greg@kroah.com [PATCH] I2C: clean up the i2c-elv.c driver a bit drivers/i2c/busses/i2c-elv.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff -Nru a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c --- a/drivers/i2c/busses/i2c-elv.c Mon Sep 22 16:12:46 2003 +++ b/drivers/i2c/busses/i2c-elv.c Mon Sep 22 16:12:46 2003 @@ -21,8 +21,6 @@ /* With some changes from Kyösti Mälkki and even Frodo Looijaard */ -/* $Id: i2c-elv.c,v 1.27 2003/01/21 08:08:16 kmalkki Exp $ */ - #include #include #include @@ -36,7 +34,7 @@ #define DEFAULT_BASE 0x378 static int base=0; -static unsigned char PortData = 0; +static unsigned char port_data = 0; /* ----- global defines ----------------------------------------------- */ #define DEB(x) /* should be reasonable open, close &c. */ @@ -57,21 +55,21 @@ static void bit_elv_setscl(void *data, int state) { if (state) { - PortData &= 0xfe; + port_data &= 0xfe; } else { - PortData |=1; + port_data |=1; } - outb(PortData, DATA); + outb(port_data, DATA); } static void bit_elv_setsda(void *data, int state) { if (state) { - PortData &=0xfd; + port_data &=0xfd; } else { - PortData |=2; + port_data |=2; } - outb(PortData, DATA); + outb(port_data, DATA); } static int bit_elv_getscl(void *data) @@ -103,7 +101,7 @@ goto fail; } - PortData = 0; + port_data = 0; bit_elv_setsda((void*)base,1); bit_elv_setscl((void*)base,1); return 0; @@ -129,14 +127,13 @@ static struct i2c_adapter bit_elv_ops = { .owner = THIS_MODULE, - .id = I2C_HW_B_ELV, .algo_data = &bit_elv_data, .name = "ELV Parallel port adaptor", }; static int __init i2c_bitelv_init(void) { - printk(KERN_INFO "i2c-elv.o: i2c ELV parallel port adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); + printk(KERN_INFO "i2c ELV parallel port adapter driver\n"); if (base==0) { /* probe some values */ base=DEFAULT_BASE;