ChangeSet 1.2077, 2005/03/12 09:15:08-08:00, [EMAIL PROTECTED]
[PATCH] Fix compile warnings in PA-RISC LEC driver
LED addresses are physical addresses, not remapped.
Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
drivers/parisc/lasi.c | 2 +-
drivers/parisc/led.c | 23 ++++++++++++-----------
include/asm-parisc/led.h | 8 ++++++--
3 files changed, 19 insertions(+), 14 deletions(-)
diff -Nru a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
--- a/drivers/parisc/lasi.c 2005-03-12 21:42:57 -08:00
+++ b/drivers/parisc/lasi.c 2005-03-12 21:42:57 -08:00
@@ -139,7 +139,7 @@
break;
}
- register_led_driver(DISPLAY_MODEL_LASI, LED_CMD_REG_NONE, (char
*)datareg);
+ register_led_driver(DISPLAY_MODEL_LASI, LED_CMD_REG_NONE, datareg);
}
#endif
diff -Nru a/drivers/parisc/led.c b/drivers/parisc/led.c
--- a/drivers/parisc/led.c 2005-03-12 21:42:57 -08:00
+++ b/drivers/parisc/led.c 2005-03-12 21:42:57 -08:00
@@ -77,8 +77,8 @@
struct pdc_chassis_lcd_info_ret_block {
unsigned long model:16; /* DISPLAY_MODEL_XXXX */
unsigned long lcd_width:16; /* width of the LCD in chars
(DISPLAY_MODEL_LCD only) */
- char *lcd_cmd_reg_addr; /* ptr to LCD cmd-register & data ptr
for LED */
- char *lcd_data_reg_addr; /* ptr to LCD data-register (LCD only)
*/
+ unsigned long lcd_cmd_reg_addr; /* ptr to LCD cmd-register & data ptr
for LED */
+ unsigned long lcd_data_reg_addr; /* ptr to LCD data-register (LCD only)
*/
unsigned int min_cmd_delay; /* delay in uS after cmd-write (LCD
only) */
unsigned char reset_cmd1; /* command #1 for writing LCD string
(LCD only) */
unsigned char reset_cmd2; /* command #2 for writing LCD string
(LCD only) */
@@ -102,8 +102,8 @@
{
.model = DISPLAY_MODEL_LCD,
.lcd_width = 16,
- .lcd_cmd_reg_addr = (char *) KITTYHAWK_LCD_CMD,
- .lcd_data_reg_addr = (char *) KITTYHAWK_LCD_DATA,
+ .lcd_cmd_reg_addr = KITTYHAWK_LCD_CMD,
+ .lcd_data_reg_addr = KITTYHAWK_LCD_DATA,
.min_cmd_delay = 40,
.reset_cmd1 = 0x80,
.reset_cmd2 = 0xc0,
@@ -540,20 +540,20 @@
**
*/
-int __init register_led_driver(int model, char *cmd_reg, char *data_reg)
+int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long
data_reg)
{
static int initialized;
if (initialized || !data_reg)
- return 1;
+ return 1;
lcd_info.model = model; /* store the values */
- LCD_CMD_REG = (cmd_reg == LED_CMD_REG_NONE) ? NULL : cmd_reg;
+ LCD_CMD_REG = (cmd_reg == LED_CMD_REG_NONE) ? 0 : cmd_reg;
switch (lcd_info.model) {
case DISPLAY_MODEL_LCD:
LCD_DATA_REG = data_reg;
- printk(KERN_INFO "LCD display at %p,%p registered\n",
+ printk(KERN_INFO "LCD display at %lx,%lx registered\n",
LCD_CMD_REG , LCD_DATA_REG);
led_func_ptr = led_LCD_driver;
lcd_print( lcd_text_default );
@@ -563,14 +563,14 @@
case DISPLAY_MODEL_LASI:
LED_DATA_REG = data_reg;
led_func_ptr = led_LASI_driver;
- printk(KERN_INFO "LED display at %p registered\n",
LED_DATA_REG);
+ printk(KERN_INFO "LED display at %lx registered\n",
LED_DATA_REG);
led_type = LED_NOLCD;
break;
case DISPLAY_MODEL_OLD_ASP:
LED_DATA_REG = data_reg;
led_func_ptr = led_ASP_driver;
- printk(KERN_INFO "LED (ASP-style) display at %p registered\n",
+ printk(KERN_INFO "LED (ASP-style) display at %lx registered\n",
LED_DATA_REG);
led_type = LED_NOLCD;
break;
@@ -695,7 +695,8 @@
lcd_info.model = DISPLAY_MODEL_NONE;
chassis_info.actcnt = chassis_info.maxcnt = 0;
- if ((ret = pdc_chassis_info(&chassis_info, &lcd_info,
sizeof(lcd_info))) == PDC_OK) {
+ ret = pdc_chassis_info(&chassis_info, &lcd_info, sizeof(lcd_info));
+ if (ret == PDC_OK) {
DPRINTK((KERN_INFO "%s: chassis info: model=%d (%s), "
"lcd_width=%d, cmd_delay=%u,\n"
"%s: sizecnt=%d, actcnt=%ld, maxcnt=%ld\n",
diff -Nru a/include/asm-parisc/led.h b/include/asm-parisc/led.h
--- a/include/asm-parisc/led.h 2005-03-12 21:42:57 -08:00
+++ b/include/asm-parisc/led.h 2005-03-12 21:42:57 -08:00
@@ -21,19 +21,23 @@
#define DISPLAY_MODEL_LASI 2 /* LASI style 8 bit LED */
#define DISPLAY_MODEL_OLD_ASP 0x7F /* faked: ASP style 8 x 1 bit LED (only
very old ASP versions) */
-#define LED_CMD_REG_NONE NULL /* NULL == no addr for the cmd register
*/
+#define LED_CMD_REG_NONE 0 /* NULL == no addr for the cmd register
*/
/* led tasklet struct */
extern struct tasklet_struct led_tasklet;
/* register_led_driver() */
-int __init register_led_driver( int model, char *cmd_reg, char *data_reg );
+int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long
data_reg);
/* registers the LED regions for procfs */
void __init register_led_regions(void);
+#ifdef CONFIG_CHASSIS_LCD_LED
/* writes a string to the LCD display (if possible on this h/w) */
int lcd_print(char *str);
+#else
+#define lcd_print(str)
+#endif
/* main LED initialization function (uses PDC) */
int __init led_init(void);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
