Skip to content

Commit ce3997a

Browse files
AaronDotbroonie
authored andcommitted
ASoC: loongson: Simplify probe() with local dev variable
Simplify the probe() function by using local 'dev' instead of &pdev->dev. Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> Link: https://patch.msgid.link/1984a20930da515e2a478b02159f83c02498f6be.1725844530.git.zhoubinbin@loongson.cn Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent f2bd6f5 commit ce3997a

2 files changed

Lines changed: 24 additions & 23 deletions

File tree

sound/soc/loongson/loongson_card.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,40 +159,41 @@ static int loongson_card_parse_of(struct loongson_card_data *data)
159159
static int loongson_asoc_card_probe(struct platform_device *pdev)
160160
{
161161
struct loongson_card_data *ls_priv;
162+
struct device *dev = &pdev->dev;
162163
struct snd_soc_card *card;
163164
int ret;
164165

165-
ls_priv = devm_kzalloc(&pdev->dev, sizeof(*ls_priv), GFP_KERNEL);
166+
ls_priv = devm_kzalloc(dev, sizeof(*ls_priv), GFP_KERNEL);
166167
if (!ls_priv)
167168
return -ENOMEM;
168169

169170
card = &ls_priv->snd_card;
170171

171-
card->dev = &pdev->dev;
172+
card->dev = dev;
172173
card->owner = THIS_MODULE;
173174
card->dai_link = loongson_dai_links;
174175
card->num_links = ARRAY_SIZE(loongson_dai_links);
175176
snd_soc_card_set_drvdata(card, ls_priv);
176177

177-
ret = device_property_read_string(&pdev->dev, "model", &card->name);
178+
ret = device_property_read_string(dev, "model", &card->name);
178179
if (ret) {
179-
dev_err(&pdev->dev, "Error parsing card name: %d\n", ret);
180+
dev_err(dev, "Error parsing card name: %d\n", ret);
180181
return ret;
181182
}
182-
ret = device_property_read_u32(&pdev->dev, "mclk-fs", &ls_priv->mclk_fs);
183+
ret = device_property_read_u32(dev, "mclk-fs", &ls_priv->mclk_fs);
183184
if (ret) {
184-
dev_err(&pdev->dev, "Error parsing mclk-fs: %d\n", ret);
185+
dev_err(dev, "Error parsing mclk-fs: %d\n", ret);
185186
return ret;
186187
}
187188

188-
if (has_acpi_companion(&pdev->dev))
189+
if (has_acpi_companion(dev))
189190
ret = loongson_card_parse_acpi(ls_priv);
190191
else
191192
ret = loongson_card_parse_of(ls_priv);
192193
if (ret < 0)
193194
return ret;
194195

195-
return devm_snd_soc_register_card(&pdev->dev, card);
196+
return devm_snd_soc_register_card(dev, card);
196197
}
197198

198199
static const struct of_device_id loongson_asoc_dt_ids[] = {

sound/soc/loongson/loongson_i2s_pci.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,33 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
7575
{
7676
const struct fwnode_handle *fwnode = pdev->dev.fwnode;
7777
struct loongson_dma_data *tx_data, *rx_data;
78+
struct device *dev = &pdev->dev;
7879
struct loongson_i2s *i2s;
7980
int ret;
8081

8182
if (pcim_enable_device(pdev)) {
82-
dev_err(&pdev->dev, "pci_enable_device failed\n");
83+
dev_err(dev, "pci_enable_device failed\n");
8384
return -ENODEV;
8485
}
8586

86-
i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
87+
i2s = devm_kzalloc(dev, sizeof(*i2s), GFP_KERNEL);
8788
if (!i2s)
8889
return -ENOMEM;
8990

9091
i2s->rev_id = pdev->revision;
91-
i2s->dev = &pdev->dev;
92+
i2s->dev = dev;
9293
pci_set_drvdata(pdev, i2s);
9394

94-
ret = pcim_iomap_regions(pdev, 1 << 0, dev_name(&pdev->dev));
95+
ret = pcim_iomap_regions(pdev, 1 << 0, dev_name(dev));
9596
if (ret < 0) {
96-
dev_err(&pdev->dev, "iomap_regions failed\n");
97+
dev_err(dev, "iomap_regions failed\n");
9798
return ret;
9899
}
99100
i2s->reg_base = pcim_iomap_table(pdev)[0];
100-
i2s->regmap = devm_regmap_init_mmio(&pdev->dev, i2s->reg_base,
101+
i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base,
101102
&loongson_i2s_regmap_config);
102103
if (IS_ERR(i2s->regmap)) {
103-
dev_err(&pdev->dev, "regmap_init_mmio failed\n");
104+
dev_err(dev, "regmap_init_mmio failed\n");
104105
return PTR_ERR(i2s->regmap);
105106
}
106107

@@ -115,34 +116,33 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
115116

116117
tx_data->irq = fwnode_irq_get_byname(fwnode, "tx");
117118
if (tx_data->irq < 0) {
118-
dev_err(&pdev->dev, "dma tx irq invalid\n");
119+
dev_err(dev, "dma tx irq invalid\n");
119120
return tx_data->irq;
120121
}
121122

122123
rx_data->irq = fwnode_irq_get_byname(fwnode, "rx");
123124
if (rx_data->irq < 0) {
124-
dev_err(&pdev->dev, "dma rx irq invalid\n");
125+
dev_err(dev, "dma rx irq invalid\n");
125126
return rx_data->irq;
126127
}
127128

128-
device_property_read_u32(&pdev->dev, "clock-frequency", &i2s->clk_rate);
129+
device_property_read_u32(dev, "clock-frequency", &i2s->clk_rate);
129130
if (!i2s->clk_rate) {
130-
dev_err(&pdev->dev, "clock-frequency property invalid\n");
131+
dev_err(dev, "clock-frequency property invalid\n");
131132
return -EINVAL;
132133
}
133134

134-
dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
135+
dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
135136

136137
if (i2s->rev_id == 1) {
137138
regmap_write(i2s->regmap, LS_I2S_CTRL, I2S_CTRL_RESET);
138139
udelay(200);
139140
}
140141

141-
ret = devm_snd_soc_register_component(&pdev->dev,
142-
&loongson_i2s_component,
142+
ret = devm_snd_soc_register_component(dev, &loongson_i2s_component,
143143
&loongson_i2s_dai, 1);
144144
if (ret) {
145-
dev_err(&pdev->dev, "register DAI failed %d\n", ret);
145+
dev_err(dev, "register DAI failed %d\n", ret);
146146
return ret;
147147
}
148148

0 commit comments

Comments
 (0)