Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

extcon: Fix the checkpatch warning

Browse Source 
This patch fixes the checkpatch warning about coding style.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Chanwoo Choi 2015-03-07 01:41:36 +09:00
parent f68a8342b1
commit 34825e5119
7 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/extcon/extcon-max14577.c
View File

@ -539,8 +539,6 @@ static void max14577_muic_irq_work(struct work_struct *work)
dev_err(info->dev, "failed to handle MUIC interrupt\n"); dev_err(info->dev, "failed to handle MUIC interrupt\n");
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
return;
} }
/* /*
@ -730,8 +728,7 @@ static int max14577_muic_probe(struct platform_device *pdev)
muic_irq->name, info); muic_irq->name, info);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed: irq request (IRQ: %d," "failed: irq request (IRQ: %d, error :%d)\n",
" error :%d)\n",
muic_irq->irq, ret); muic_irq->irq, ret);
return ret; return ret;
} }

5
drivers/extcon/extcon-max77693.c
View File

@ -1019,8 +1019,6 @@ static void max77693_muic_irq_work(struct work_struct *work)
dev_err(info->dev, "failed to handle MUIC interrupt\n"); dev_err(info->dev, "failed to handle MUIC interrupt\n");
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
return;
} }
static irqreturn_t max77693_muic_irq_handler(int irq, void *data) static irqreturn_t max77693_muic_irq_handler(int irq, void *data)
@ -1171,8 +1169,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
muic_irq->name, info); muic_irq->name, info);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed: irq request (IRQ: %d," "failed: irq request (IRQ: %d, error :%d)\n",
" error :%d)\n",
muic_irq->irq, ret); muic_irq->irq, ret);
return ret; return ret;
} }

5
drivers/extcon/extcon-max8997.c
View File

@ -579,8 +579,6 @@ static void max8997_muic_irq_work(struct work_struct *work)
dev_err(info->dev, "failed to handle MUIC interrupt\n"); dev_err(info->dev, "failed to handle MUIC interrupt\n");
mutex_unlock(&info->mutex); mutex_unlock(&info->mutex);
return;
} }
static irqreturn_t max8997_muic_irq_handler(int irq, void *data) static irqreturn_t max8997_muic_irq_handler(int irq, void *data)
@ -689,8 +687,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
muic_irq->name, info); muic_irq->name, info);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed: irq request (IRQ: %d," "failed: irq request (IRQ: %d, error :%d)\n",
" error :%d)\n",
muic_irq->irq, ret); muic_irq->irq, ret);
goto err_irq; goto err_irq;
} }

6
drivers/extcon/extcon-rt8973a.c
View File

@ -582,10 +582,8 @@ static int rt8973a_muic_i2c_probe(struct i2c_client *i2c,
return -EINVAL; return -EINVAL;
info = devm_kzalloc(&i2c->dev, sizeof(*info), GFP_KERNEL); info = devm_kzalloc(&i2c->dev, sizeof(*info), GFP_KERNEL);
if (!info) { if (!info)
dev_err(&i2c->dev, "failed to allocate memory\n");
return -ENOMEM; return -ENOMEM;
}
i2c_set_clientdata(i2c, info); i2c_set_clientdata(i2c, info);
info->dev = &i2c->dev; info->dev = &i2c->dev;
@ -681,7 +679,7 @@ static int rt8973a_muic_i2c_remove(struct i2c_client *i2c)
return 0; return 0;
} }
static struct of_device_id rt8973a_dt_match[] = { static const struct of_device_id rt8973a_dt_match[] = {
{ .compatible = "richtek,rt8973a-muic" }, { .compatible = "richtek,rt8973a-muic" },
{ }, { },
}; };

6
drivers/extcon/extcon-sm5502.c
View File

@ -359,8 +359,8 @@ static unsigned int sm5502_muic_get_cable_type(struct sm5502_muic_info *info)
break; break;
default: default:
dev_dbg(info->dev, dev_dbg(info->dev,
"cannot identify the cable type: adc(0x%x) " "cannot identify the cable type: adc(0x%x)\n",
"dev_type1(0x%x)\n", adc, dev_type1); adc);
return -EINVAL; return -EINVAL;
}; };
break; break;
@ -659,7 +659,7 @@ static int sm5502_muic_i2c_remove(struct i2c_client *i2c)
return 0; return 0;
} }
static struct of_device_id sm5502_dt_match[] = { static const struct of_device_id sm5502_dt_match[] = {
{ .compatible = "siliconmitus,sm5502-muic" }, { .compatible = "siliconmitus,sm5502-muic" },
{ }, { },
}; };

2
drivers/extcon/extcon-usb-gpio.c
View File

@ -214,7 +214,7 @@ static int usb_extcon_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(usb_extcon_pm_ops, static SIMPLE_DEV_PM_OPS(usb_extcon_pm_ops,
usb_extcon_suspend, usb_extcon_resume); usb_extcon_suspend, usb_extcon_resume);
static struct of_device_id usb_extcon_dt_match[] = { static const struct of_device_id usb_extcon_dt_match[] = {
{ .compatible = "linux,extcon-usb-gpio", }, { .compatible = "linux,extcon-usb-gpio", },
{ /* sentinel */ } { /* sentinel */ }
}; };

1
drivers/extcon/extcon.c
View File

@ -158,6 +158,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr,
/* Optional callback given by the user */ /* Optional callback given by the user */
if (edev->print_name) { if (edev->print_name) {
int ret = edev->print_name(edev, buf); int ret = edev->print_name(edev, buf);
if (ret >= 0) if (ret >= 0)
return ret; return ret;
} }